First commit
Merge branch 'master' of https://github.com/jhonis/SquareGame

Conflicts:
	AndroidManifest.xml
	res/layout/main.xml
	res/values/strings.xml
Merge