tex edits.
Merge branch 'master' of https://github.com/frproulx/are213

Conflicts:
	ps2/ps2b.aux
	ps2/ps2b.log
cleaning up commit / sync
almost...