Updated web.js
Merge branch 'master' of https://github.com/StarenseN/Bitstarter

Conflicts:
	web.js
Merge branch 'master' of https://github.com/StarenseN/Bitstarter