support for simple world generation
Merge branch 'master' of https://github.com/RobbertJongeling/ld29

Conflicts:
	src/launcher/Main.java