Eval
Merge branch 'master' of https://github.com/shiqingma/536final

Conflicts:
	evaluation.tex