Add info on how to deploy to Heroku using Ruby
upgraded testem
Merge remote-tracking branch 'origin/master' into proxy-server

Conflicts:
	package.json