I'm not sure what this is
Merge branch 'master' of https://github.com/robertsychen/CS125Pset2

Conflicts:
	randmst