Updated web.js
index.html added
Merge branch 'master' of https://github.com/orbanz/bitstarter

Conflicts:
	web.js
Merge branch 'master' of https://github.com/orbanz/bitstarter

Conflicts:
	web.js