Merge pull request #7 from Vorskabobble/Editor

merging
Merge pull request #8 from Vorskabobble/Editor

update
my branch
Merge pull request #10 from Vorskabobble/Game

my merge
commit
Merge pull request #11 from Vorskabobble/Game

update 1
Manual merge

manually merging editor and master
Master