closes #3
Merge branch 'master' of https://github.com/TobiasBodewig/Ludum-Dare-30.git