edited rest of the paper
Merge branch 'master' of https://github.com/lanctot/sm-journal

Conflicts:
	conclusion.tex
	evaluation.tex