fixes media queries issues
webcam upload
correctly positioned buttons
typos
Merge branch 'master' into issue4-webcam

Conflicts:
	app/app.js
	app/styles/colorMirror.mediaqueries.less
removed origin
removed orig
updated gitignore
Merge pull request #27 from tobozo/issue4-webcam

Issue4 webcam