Updates
TEST
Merge branch 'master' of https://github.com/patrickmooney/bitstarter

Conflicts:
	grader.js