update to camera
a
Merge branch 'master' of https://github.com/jdhuns2/cs499

Conflicts:
	cs499-csharp.sln
	cs499.sln