diff --git a/.gitignore b/.gitignore
index 88acfc3..7d6787c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,5 +30,9 @@ node_modules
.npm
# Optional REPL history
+<<<<<<< HEAD
.node_repl_history
-.idea
\ No newline at end of file
+=======
+.node_repl_history
+.idea
+>>>>>>> sir/master
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..7b0be10
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+201601node
\ No newline at end of file
diff --git a/.idea/201601node.iml b/.idea/201601node.iml
new file mode 100644
index 0000000..2931aec
--- /dev/null
+++ b/.idea/201601node.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..97626ba
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml
new file mode 100644
index 0000000..cd1df6d
--- /dev/null
+++ b/.idea/jsLibraryMappings.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/201601node_node_modules.xml b/.idea/libraries/201601node_node_modules.xml
new file mode 100644
index 0000000..036cc50
--- /dev/null
+++ b/.idea/libraries/201601node_node_modules.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ true
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ $PROJECT_DIR$
+ true
+
+ bdd
+
+ DIRECTORY
+
+ false
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 1457229239481
+
+ 1457229239481
+
+
+ 1457231367943
+
+
+ 1457231367943
+
+
+ 1457233082333
+
+
+ 1457233082333
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/6.file/7.path.js b/6.file/7.path.js
index c8dfd21..a2e6d1f 100644
--- a/6.file/7.path.js
+++ b/6.file/7.path.js
@@ -14,7 +14,11 @@ console.log(__dirname);//获取 当前模块所在的绝对目录
//获取一个路径里文件的名
console.log(path.basename('7.path.js','.js'));
//获取一个路径里文件的扩展名
+<<<<<<< HEAD
+console.log(path.extname('7.path.js'));
+=======
console.log(path.extname('7.path.js'));
//从一个相对路径解析出一个绝对路径
//以应用程序的所在目录为根起
console.log(path.resolve('book','node.json','..','mysql.json'));
+>>>>>>> sir/master
diff --git "a/homework/\347\254\254\344\270\200\345\221\250\344\275\234\344\270\232.md" "b/homework/\347\254\254\344\270\200\345\221\250\344\275\234\344\270\232.md"
new file mode 100644
index 0000000..7f3ab9c
--- /dev/null
+++ "b/homework/\347\254\254\344\270\200\345\221\250\344\275\234\344\270\232.md"
@@ -0,0 +1,6 @@
+# 1. 玩游戏截图
+# 2. 发布一个npm包到服务器上
+# 3. 实现一个Buffer.concat方法
+
+
+
diff --git "a/pdf/1.\345\274\200\345\244\264\345\205\270\347\244\274.pdf" "b/pdf/1.\345\274\200\345\244\264\345\205\270\347\244\274.pdf"
index 68a763f..8283654 100644
Binary files "a/pdf/1.\345\274\200\345\244\264\345\205\270\347\244\274.pdf" and "b/pdf/1.\345\274\200\345\244\264\345\205\270\347\244\274.pdf" differ
diff --git a/pdf/2.git.pdf b/pdf/2.git.pdf
index 1862938..e26ea15 100644
Binary files a/pdf/2.git.pdf and b/pdf/2.git.pdf differ
diff --git "a/pdf/3.1 NODE\345\256\211\350\243\205\344\270\216\351\205\215\347\275\256.pdf" "b/pdf/3.1 NODE\345\256\211\350\243\205\344\270\216\351\205\215\347\275\256.pdf"
index 0e6a16f..2d51340 100644
Binary files "a/pdf/3.1 NODE\345\256\211\350\243\205\344\270\216\351\205\215\347\275\256.pdf" and "b/pdf/3.1 NODE\345\256\211\350\243\205\344\270\216\351\205\215\347\275\256.pdf" differ
diff --git "a/pdf/3.2 webstorm\345\256\211\350\243\205\344\270\216\351\205\215\347\275\256.pdf" "b/pdf/3.2 webstorm\345\256\211\350\243\205\344\270\216\351\205\215\347\275\256.pdf"
index 639ff68..7fe1ddd 100644
Binary files "a/pdf/3.2 webstorm\345\256\211\350\243\205\344\270\216\351\205\215\347\275\256.pdf" and "b/pdf/3.2 webstorm\345\256\211\350\243\205\344\270\216\351\205\215\347\275\256.pdf" differ
diff --git "a/pdf/4.node\345\237\272\347\241\200.pdf" "b/pdf/4.node\345\237\272\347\241\200.pdf"
index f0ac635..ca0b3bd 100644
Binary files "a/pdf/4.node\345\237\272\347\241\200.pdf" and "b/pdf/4.node\345\237\272\347\241\200.pdf" differ
diff --git "a/pdf/5.\346\250\241\345\235\227.pdf" "b/pdf/5.\346\250\241\345\235\227.pdf"
index ac828d0..862fc27 100644
Binary files "a/pdf/5.\346\250\241\345\235\227.pdf" and "b/pdf/5.\346\250\241\345\235\227.pdf" differ
diff --git a/pdf/6.buffer.pdf b/pdf/6.buffer.pdf
index 3937648..11e3532 100644
Binary files a/pdf/6.buffer.pdf and b/pdf/6.buffer.pdf differ
diff --git a/pdf/7.file.pdf b/pdf/7.file.pdf
index 88d5869..48d867f 100644
Binary files a/pdf/7.file.pdf and b/pdf/7.file.pdf differ
diff --git a/pdf/8.1 http.pdf b/pdf/8.1 http.pdf
new file mode 100644
index 0000000..1c11fef
Binary files /dev/null and b/pdf/8.1 http.pdf differ
diff --git a/pdf/8.2.ajax.pdf b/pdf/8.2.ajax.pdf
new file mode 100644
index 0000000..31d0d44
Binary files /dev/null and b/pdf/8.2.ajax.pdf differ
diff --git a/pdf/8.3 jsonp.pdf b/pdf/8.3 jsonp.pdf
new file mode 100644
index 0000000..6762bcd
Binary files /dev/null and b/pdf/8.3 jsonp.pdf differ
diff --git a/pdf/8.4 cross.pdf b/pdf/8.4 cross.pdf
new file mode 100644
index 0000000..2dc2e08
Binary files /dev/null and b/pdf/8.4 cross.pdf differ
diff --git a/pdf/8.5.restful.pdf b/pdf/8.5.restful.pdf
new file mode 100644
index 0000000..21f449f
Binary files /dev/null and b/pdf/8.5.restful.pdf differ
diff --git "a/\345\215\236\345\212\237\347\243\212/friLessTest.html" "b/\345\215\236\345\212\237\347\243\212/friLessTest.html"
new file mode 100644
index 0000000..e88a868
--- /dev/null
+++ "b/\345\215\236\345\212\237\347\243\212/friLessTest.html"
@@ -0,0 +1,10 @@
+
+
+
+
+ Title
+
+
+第一节课git测试
+
+
\ No newline at end of file