Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
add category controller specs
Merge pull request #34 from shaunmcgeever/testing

Testing