Break up shop tests #56
Merge pull request #72 from Kae7in/update_shop_tests

Break up shop tests #56
Add neutralize method to creatures and update a few model columns
adding data files for Locations and Shops
Fix story tests and related issues with model structure
Add brewing ability and ingredients for potions
Adding creature data
add framework for static routing
Merge pull request #74 from Kae7in/update_creatures

Add neutralize method to creatures and update a few model columns
Merge branch 'master' into brewing

Conflicts:
	hogwarts/library/models.py
Merge pull request #77 from Kae7in/brewing

Brewing
Merge pull request #79 from Kae7in/static_routing

add framework for static routing
added directories in template for artifacts, creatures, locations, and spells, as well as the bootstrap files (css, fonts, and js)
move bootstrap into static folder
Save only files we need
fix typo
added data field to Spells class
Update from direct_to_template to TemplateView
Merge pull request #87 from Kae7in/fix_generic_views

Update from direct_to_template to TemplateView
Merge branch 'master' into update_character_model

Conflicts:
	hogwarts/library/models.py