Committing so I can pull.
Merge branch 'master' of github.com:finger563/CS283Project

Conflicts:
	framebufferobject/framebufferobject.vcxproj.filters
Merge branch 'master' of github.com:finger563/CS283Project
A few changes to camera class