[Finishes #69410394 #69410444]
[Finishes #69410464]
Merge branch 'master' of github.com:JimBarrows/RpgStoryTellersAid

Conflicts:
	stories/views.py