Fixed issues with main/game activity overlaps
Merge branch 'master' of github.com:The-Real-CSCI201/TanksAndroid