save camera work
Merge remote-tracking branch 'origin/master'
picture taking commit
Merge remote-tracking branch 'origin/master'