death-almost
broken shit
all fixed
Merge branch 'points'

Conflicts:
	basegame.js
	world.js
Missed merge head thingy