ggg
Merge branch 'master' of https://github.com/montoya46/GBD.git

Conflicts:
	src/cat/montoya/gbd/GameActivity.java