Added some CSS fixes to header
Merge branch 'develop' of github.com:byu-osl/bookout into develop

Conflicts:
	bookout/templates/maintemplate.html

Fixed merge conflict in maintemplate