1, 1.1, 1.2 done
Merge branch 'master' of https://github.com/yoavfreund/Plato

Conflicts:
	introduction.tex