Collision will now be handled in the main game class
Merge branch 'master' of https://github.com/ScruffyTheJanitor/TheFloridiansFlaw.git