Corrections Axel + Julien
Merge branch 'master' of https://github.com/giliam/mig2013

Conflicts:
	Rapport/Rapport.pdf