webcam stuff that doesn't work yet
Merge remote-tracking branch 'origin/master'