Current work on Hw3
Merge branch 'master' of https://github.com/TonyHsieh/bitstarter

Conflicts:
	grader.js