Update README.md
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
Merge pull request #27 from shaunmcgeever/testing

Testing
Merge pull request #28 from shaunmcgeever/testing

made failing tests temporarily pending to test Travis CI
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
fix homepage bug on select drop down
take out console.log debugger
sign in login redesign
Merge pull request #29 from plondon/bug/homepage-select

fix homepage bug on select drop down
fix css syntax screw up
Merge pull request #30 from plondon/chore/login_design

sign in login redesign
fix merge conflict
Merge branch 'shaunmcgeever-testing'
Merge pull request #32 from plondon/master

fix merge conflict regarding database and log files
Merge branch 'master' of https://github.com/fiddler-crabs-2014/thedelta
add category controller specs