a little bit of changes to get ready for other things
Merge branch 'master' of https://github.com/joethered/Introversion-Game