Adding styles
CSS file got lost in the merge. Weird.
Merge remote-tracking branch 'origin/master'

Conflicts:
	templates/base.html
CSS file got lost in the merge. Weird.
Merge branch 'v1.5'