Line commented the openglwindow.cpp file
Merge branch 'master' of https://github.com/rit-sse/SpaceJam

Conflicts:
	CodeScrap/.DS_Store