webcam buttons
Merge branch 'master' of https://github.com/HackNash-6/hacknash-facelock-web-ui

Conflicts:
	app/interactioncam.js
	app/webcam.css
	app/webcam.html