Merge pull request #10 from Vorskabobble/Game

my merge
new World

-started adding new world function, currently crashes
Merge pull request #11 from Vorskabobble/Game

update 1
Default world

- added a default world that cant be overwritten
- removed new world function
- renamed load and save to loadWorld and saveWorld
2
manual merge

- manually included the new screen manager
spacing
7
manual merge
Manual merge

manually merging editor and master
Master
fixes

- github added duplicate code, this has been removed
fixed error in includes
Merge pull request #16 from Vorskabobble/Editor

Editor
com