something new
Merge branch 'master' of https://github.com/zjuash/bitstarter

Conflicts:
	index.html
	web.js