Merge branch 'master' of https://github.com/jerryjluo/bitstarter

Conflicts:
	web.js
Merge remote-tracking branch 'origin/master'

Conflicts:
	web.js