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

Conflicts:
	web.js