putting in print statements
Merge branch 'master' into camera_debug
andor server
Merge branches 'master' and 'camera_debug'