set stories_controller_spec tests to green
Merge branch 'master' into stories_controller_tests
Merge pull request #30 from cicadas-2014/stories_controller_tests

set stories_controller_spec tests to green