Added Stories and Spells to sidebar.
Merge branch 'master' into add_to_sidebar

Conflicts:
	hogwarts/marauder/templates/potions/2.html
Merge pull request #168 from Kae7in/add_to_sidebar

Added Stories and Spells to sidebar.