Fix story tests and related issues with model structure
Add brewing ability and ingredients for potions
Merge branch 'master' into brewing

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

Brewing