Merge branch 'master' of https://github.com/john6/cs184

Conflicts:
	Main.cpp
	Main.o
working camera and print tests