updated for new server stuff
stuff
Merge branch 'master' of https://github.com/HackNash-6/hacknash-facelock-web-ui
animation
image upload sort of works
Merge branch 'master' of github.com:HackNash-6/hacknash-facelock-web-ui
asd
a
styling updates
Merge branch 'master' of https://github.com/HackNash-6/hacknash-facelock-web-ui

Conflicts:
	app/webcam.html
last minute updates
ui update
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