pull request test.
Merge branch 'master' of github.com:cecj06googo/Mygoogo into Test1

Conflicts:
	name.txt