fixed header order for mac
Merge branch 'master' of https://github.com/austinhulse/SpaceGame
Added a game room and associated obj files.
Merge branch 'master' of https://github.com/austinhulse/SpaceGame

Conflicts:
	Makefile
	SpaceGame/GameData/Rooms/debug.room
	SpaceGame/Render.cpp