top bar styled
Merge branch 'master' of https://github.com/FinalsClub/AnnotoriousClient-Server

Conflicts:
	.gitignore
	schemas/Annotation.js
	views/index.html