styling
more styling
More styling
Merge branch 'master' of https://github.com/HackNash-6/hacknash-facelock-web-ui

Conflicts:
	app/index.html