ii
Merge branch 'master' of https://github.com/yoavfreund/Plato

Conflicts:
	description.tex
Some additions/changes by Yoav