label and ref
Merge branch 'master' of https://github.com/Wikzo/p7_paper

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