Conflict might occur?
Merge branch 'master' of https://github.com/ethanny2/Smore_up1

Conflicts:
	src/com/example/smoreup/GameActivity.java