麻煩欸
Merge branch 'master' of https://github.com/SquareJong/gittest

Conflicts:
	readme.txt