修改
Merge branch 'master' of https://github.com/jinlyfree/fb.git

Conflicts:
	README.md
修改