temp commit
Merge branch 'master' of https://github.com/Kae7in/cs373-idb into base.html
basic side bar in base.html
Merge branch 'master' into base.html

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

Base.html