Meh.
Merge branch 'protohype' of https://github.com/ifdm/overgrowth into protohype

Conflicts:
	class/player.lua