completed dialog!
Merge branch 'master' of github.com:HackNash-6/hacknash-facelock-web-ui

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