Game Stuff
Merge branch 'master' of https://github.com/horsetailfiddlehead/ee478

Conflicts:
	Final Project/FrontEnd.X/globals.h fixed