Fixed link to Dumbledore in a Potion page
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