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

Conflicts:
	AndroidManifest.xml
simple