updated header and splash page
Merge branch 'master' into header_and_splash_updates

Conflicts:
	hogwarts/marauder/templates/base.html
Merge pull request #177 from Kae7in/header_and_splash_updates

updated header and splash page