try
Merge branch 'master' of https://github.com/pkiin/assn4

Conflicts:
	openglTest.sdf
shooo