modified:   New_ER/Makefile
	deleted:    New_ER/Makefile~
	modified:   New_ER/bin/le_nom
	deleted:    New_ER/fichier
	deleted:    New_ER/fichier2
	deleted:    New_ER/fichuier
	modified:   New_ER/header/LinearFunction.h
	modified:   New_ER/header/ListInterval.h
	modified:   New_ER/header/Satisfiability.h
	modified:   New_ER/header/Solution.h
	modified:   New_ER/header/event_model.h
	modified:   New_ER/source/ListInterval.cpp
	modified:   New_ER/source/Satisfiability.cpp
	modified:   New_ER/source/Solution.cpp
	modified:   New_ER/source/TestBB.cpp
	modified:   New_ER/source/event_model.cpp
	modified:   New_ER/source/main.cpp
merge