Web.js atltered
Merge branch 'master' of https://github.com/gauloise/bitstarter

Conflicts:
	web.js
web
s
3
5
2
Merge branch 'master' of https://github.com/gauloise/bitstarter
Changed index.html