Added code for colision, cleared code, better structure.
Merge branch 'master' of https://github.com/thalvadzhi/theGrimAvenger