Merge pull request #1 from njlu820/master

by lulu first commit
by comus: 改左一小段
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.md