Merge branch 'master' of github.com:kimpeter/eng
Add web camera
Merge branch 'master' of github.com:grammaright/eng