implemented a dynamic jumbotron to appear appear on all pages, other than the one already on the splash page
made locations, spells dynamic; fixed some potions stuff (AH)
Merge branch 'master' of github.com:Kae7in/cs373-idb
Merge pull request #284 from Kae7in/k-navbar

implemented a dynamic jumbotron to appear appear on all pages, other tha...
Merge branch 'master' into book_dynamic_views

Conflicts:
	hogwarts/marauder/templates/index.html