Code
Merge branch 'master' of https://github.com/giliam/mig2013

Conflicts:
	Rapport/ApprocheCommerciale.aux
	Rapport/LeCode.aux
	Rapport/Rapport.pdf
	Rapport/Rapport.toc
	Rapport/Technique.aux