south isnt recognizing changes like this, working around
Merge branch 'stories_changes' of github.com:Kae7in/cs373-idb into stories_changes

Conflicts:
	hogwarts/marauder/models.py
Merge pull request #270 from Kae7in/stories_changes

Stories changes