BUG FIX
Merge branch 'master' of https://github.com/kiasaki/ld27-jam

BUG FIX fix

Conflicts:
	src/main/java/ld27jam/World.java
Merge branch 'master' of https://github.com/kiasaki/ld27-jam