figure piece of shit
hmmm...
Merge branch 'master' of https://github.com/sadpants/P3-Rapport

Conflicts:
	Rapport.pdf