Merge pull request #3 from ncss-2014-group-3/master

Merge changes
Revert "DRY FTW!"

This reverts commit f96d5fb68b21c89fd27aa1239c17bc1e6724555f.
Fixed viewing a story
Merge pull request #37 from nhardy/master

Fixes displaying a story