test1
Merge branch 'master' of github.com:cecj06googo/Mygoogo

Conflicts:
	name.txt