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

Conflicts:
	grader.js
	index.html
Merge branch 'master' of https://github.com/petewood/bitstarter

Conflicts:
	grader.js
	index.html
Merge branch 'master' of https://github.com/petewood/bitstarter

Conflicts:
	grader.js
	index.html
Merge branch 'master' of https://github.com/petewood/bitstarter

Conflicts:
	grader.js
	index.html
fixed botched merge
fixed botched merge
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed
accidentally committed