init
Merge branch 'master' of heroku.com:thenewbitstarter into develop

Conflicts:
	web.js