update
Merge branch 'master' of github.com:momoplan/Game2
update
Merge branch 'master' of github.com:momoplan/Game2

Conflicts:
	AndroidManifest.xml