gameState skeleton
Merge branch 'master' of https://github.com/eckerdj1/Comp446_Game2

Conflicts:
	Game2/Game2App.cpp