Lots of updates
Merge branch 'master' of https://github.com/Chas-Fordyce/Math_Project

Conflicts:
	Math Project.gmx/objects/obj_enemy.object.gmx