Merge branch 'new_master' into camera
trying something
gitignore stuff
Merge branch 'camera' into opencv