change from mac
Merge branch 'master' of https://github.com/Guobi/Test1

Conflicts:
	1.txt