Possible Conflicts

Game UI  and Game Activity
Merge branch 'master' of https://github.com/ethanny2/Smore_up1