finished spell templates and added their images
Merge pull request #143 from Kae7in/story_views

Story views
Updated Artifact and Book tests. Resolves #137. Resolves #138.
Merge pull request #145 from Kae7in/david-test-fixes

Updated Artifact and Book tests. Resolves #137. Resolves #138.
Fixed Potion recipe field and fixed Potion tests to be up to date with new changes
Changed potions pages to reflect changes in fields
for pull request
just testing sidebar responsiveness
putting it back?
Merge pull request #153 from Kae7in/templateUpdates

Template updates
Merge pull request #147 from Kae7in/edit_potions

Fixed Potion recipe field and fixed Potion tests to be up to date with n...
fix #155 base html bugs
Merge pull request #156 from Kae7in/fix_base_html

fix #155 base html bugs
add row class
Merge pull request #157 from Kae7in/fix_base_html

add row class
Merge branch 'master' into align_with_model_changes

Conflicts:
	hogwarts/marauder/templates/potions/1.html
	hogwarts/marauder/templates/potions/2.html
	hogwarts/marauder/templates/potions/3.html