editing pass
Merge branch 'master' of https://github.com/lanctot/sm-journal

Conflicts:
	sm-journal.tex