Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
fix profile header tag
Merge pull request #33 from plondon/master

fix header and change some stylin
add category controller specs
Merge pull request #34 from shaunmcgeever/testing

Testing
turbo links were preventing javascript to load
Merge pull request #35 from shaunmcgeever/bug/javascript

turbo links were preventing javascript to load