Fixed up server, loaded it to amazon too
Merge branch 'master' of https://github.com/jeffhoffman1/StoryHub