改左好多野
Merge remote-tracking branch 'origin/master'

Conflicts:
	readme.md
Merge pull request #2 from njlu820/master

改左好多野, good