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
Fixed bug with stories with no contributions
Merge branch 'master' of https://github.com/fiddler-crabs-2014/StoryZilla
Fixed stories with no contribs issue
Merge pull request #21 from onweapps/master

Fixed some test bugs
Merge pull request #20 from keaty/master

changed the link colors from default
Merge pull request #22 from Adrian-Pask/Fix/Stories-no-contribution

Fix/stories no contribution
final css changes to contributions work