completed + archived Proj7
Merge branch 'master' of https://github.com/imtibbet/CS351

Conflicts:
	graphics/src/cylinder-test.c