temp commit
Merge branch 'master' of https://github.com/Kae7in/cs373-idb into base.html
basic side bar in base.html
Added routing for index pages
added first spells data in the format of name, incantation, aliases, effect, creator, uses, type, misc, difficulty, related creatures, unforgivable, photo
Merge branch 'master' into base.html

Conflicts:
	hogwarts/library/templates/index.html
Merge pull request #91 from Kae7in/base.html

Base.html
Merge pull request #93 from Kae7in/index_pages

Index page routing
Merge branch 'master' into character_views

Conflicts: