derp martin
Merge branch 'origin/master'

Conflicts:
	bibl.bib
	rapport.tex
Merge branch 'origin/master'