commit2
Merge branch 'master' of https://github.com/margauxN/CECSP

c'est comme ça!
commit2
commit
commit
Merge branch 'master' of https://github.com/margauxN/CECSP

Conflicts:
	New_ER/Makefile
	New_ER/bin/le_nom
	New_ER/source/BalayageProblem.o
	New_ER/source/SegmentProblem.o
	New_ER/source/Task.o
	New_ER/source/main.o