Add should.js as test framework over mocha
Add info about our testing framework in the README
Reformat code wth right indent
Add Procfile file for heroku
Fix auto-merge conflicts