fix squib tests #119
Merge pull request #161 from Kae7in/squib_test_fix

fix squib tests #119
fix spell view
Merge pull request #162 from Kae7in/fix_spell_view

fix spell view
Merge pull request #160 from Kae7in/edit_potions

Fixed link to Dumbledore in a Potion page
Merge branch 'master' into fix_links

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