Finishing
Merge branch 'dev' of https://github.com/kiasaki/ld26-jam-april2013 into dev

Conflicts:
	src/main/java/ld26_kiasaki_dagothig/World.java