fix merge conflicts
important for LevelSaver!
Merge pull request #19 from Shinigami92/master

fix merge conflicts