More to attention
Merge branch 'master' of https://github.com/Wikzo/p7_paper

Conflicts:
	Perception paper/background.tex
Attention!
Merge branch 'master' of https://github.com/Wikzo/p7_paper