Work on main
work
Merge branch 'master' of https://github.com/ferlicjl/CSE386FinalProject

Conflicts:
	Lib/OpenGLCSE386.lib