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

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

Conflicts:
	app/styles/webcam.css
Merge branch 'master' of https://github.com/HackNash-6/hacknash-facelock-web-ui

Conflicts:
	app/upload.html