Fixed link to Dumbledore in a Potion page
fix spell view
Merge pull request #162 from Kae7in/fix_spell_view

fix spell view
Merge branch 'master' into edit_potions

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

Fixed link to Dumbledore in a Potion page
update type and tests for locations in model and tests
Generated models pydoc. Resolves #128.
Merge pull request #166 from Kae7in/david-pydoc

Generated models pydoc. Resolves #128.
Merge pull request #165 from Kae7in/modelUpdates

update type and tests for locations in model and tests
Merge branch 'master' into add_to_sidebar

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