updates
Merge branch 'master' of https://github.com/troyth/RaspiCam-Tutorial-1
changes