Finally most stuff working
Merge branch 'master' of https://github.com/RussellSprouts/SeattleHackathonGame