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
turbo links were preventing javascript to load
Merge pull request #35 from shaunmcgeever/bug/javascript

turbo links were preventing javascript to load
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
fix saving new answers and redirecting
sqlite3 to test and pg gem
fixed bugs with saving deltas. renders deltas on answers index. answers controller test failing
Merge pull request #37 from shaunmcgeever/bug/currentuser

Bug/currentuser
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta

Conflicts:
	log/development.log