Merge remote-tracking branch 'origin/master'

Conflicts:
	src/test/World.java
	src/test/structures/Structure.java
Merge branch 'master' of https://github.com/mathkr/LD31