made the code look nicer for labs 3 and 4
Merge branch 'master' of https://github.com/ThinkFlow/CS171

Conflicts:
	hw4/oglRenderer.py
	hw4/oglRenderer.py~