Camera Changes
Merge branch 'master' of https://github.com/smflorentino/whiteboarder

Conflicts:
	camera.py