snapshot from last night
Merge branch 'master' of https://github.com/marieshifeng/cs161_final_project

Conflicts:
	compare
	compare.c