More scores
Merge branch 'master' of https://github.com/johnlo/cs221-project

Conflicts:
	scores.csv