ben commit
Merge branch 'master' of https://github.com/dichoben/Fruity-Co

Conflicts:
	app/src/main/AndroidManifest.xml

	app/src/main/java/com/si5/camash/fruityco/ui/activities/GameActivity.java
	app/src/main/res/values/strings.xml