Kraus changes (almost)
Kraus changes done
Merge branch 'master' of https://github.com/Wikzo/p7_paper

Conflicts:
	P7 paper/summary.tex