4
Merge branch 'master' of https://github.com/UPMC-M1/projetALGAV_S1_2013

Conflicts:
	Projet_d'ALGAV/main.cpp