faa

jht
Merge branch 'master' of https://github.com/haishangyangguang/haishangyangguang.github.com

Conflicts:
	README.md