new file:   "chenhao/4-10-\263\314\320\362\324\261\261\340\263\314\320\336\321\370.doc"
	deleted:    chenhao/4.txt
Merge branch 'master' of https://github.com/xxg1413/reading_blog

Conflicts:
	chenhao/4.txt

	modified:   chenhao/1.c
	modified:   chenhao/2.c
	modified:   chenhao/3.c
	deleted:    "chenhao/4-10-\263\314\320\362\324\261\261\340\263\314\320\336\321\370.doc"
	new file:   "chenhao/4-10-\347\250\213\345\272\217\345\221\230\347\274\226\347\250\213\344\277\256\345\205\273.doc"
	new file:   chenhao/4.txt
	new file:   chenshuo/C++ engineering practice.pdf
	new file:   chenshuo/chenshuo-blog.pdf