Merge branch 'master' of https://github.com/fiddler-crabs-2014/StoryZilla
Merge branch 'master' of https://github.com/fiddler-crabs-2014/StoryZilla
fixed some testing bugs in contributions controller, still 25 failing tests
Merge branch 'master' of https://github.com/fiddler-crabs-2014/StoryZilla
Merge pull request #21 from onweapps/master

Fixed some test bugs