Committing so I can pull.
Merge branch 'master' of https://github.com/joethered/Introversion-Game

Conflicts:
	Introversion.gmx/objects/obj_Stamina.object.gmx