init
Merge branch 'master' of heroku.com:my-bitstarter

Conflicts:
	package.json
	web.js