Merge branch 'master' of github.com:schrockblock/julintani-ccny-server
updated story controller