References, yo
Merge branch 'master' of https://github.com/Wikzo/p7_paper

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