Stuff and things!
Merge branch 'master' of https://github.com/Elementrat/559p3

Conflicts:
	js/world.js