changed some names
Merge branch 'Gameplay' of https://github.com/Daveiac/AndroidGameProject into Gameplay