made changes based on Jared's comments
Merge branch 'juliahimmel-feature_story_creation'
Merge branch 'master' of https://github.com/juliahimmel/StoryZilla