Tinkering
Merge remote-tracking branch 'origin/Gregory' into Gregory

Conflicts:
	Project5/Project5/Camera.h