More cam stuff
Merge branch 'master' of github.com:vincentleest/ECE496

Conflicts:
	main.cpp