Brought in some code from previous projects
Merge branch 'master' of github.com:Lazzu/24hgame1