Merge pull request #11 from TobiasBodewig/master

merge
Merge pull request #25 from TobiasBodewig/levelEditor

Merge pull request #11 from TobiasBodewig/master