Re-aranged stuff
Merge branch 'master' of https://github.com/INOVA-Technology/Game-that-needs-to-be-renamed
idkidkidkidk