just ps.tex
try to sync
Merge branch 'frank1121' of https://github.com/frproulx/are213 into frank1121

Conflicts:
	ps2/ps2b.aux
	ps2/ps2b.log
try to get the right document....