commit 2/10/14
	new file:   New_ER/Makefile
	new file:   New_ER/header/BalayageProblem.h
	new file:   New_ER/header/Function.h
	new file:   New_ER/header/Interval.h
	new file:   New_ER/header/IntervalProblem.h
	new file:   New_ER/header/LinearFunction.h
	new file:   New_ER/header/Piece.h
	new file:   New_ER/header/Problem.h
	new file:   New_ER/header/Segment.h
	new file:   New_ER/header/SegmentProblem.h
	new file:   New_ER/header/Solution.h
	new file:   New_ER/header/Task.h
	new file:   New_ER/header/TestBB.h
	new file:   New_ER/source/BalayageProblem.cpp
	new file:   New_ER/source/Function.cpp
	new file:   New_ER/source/Interval.cpp
	new file:   New_ER/source/LinearFunction.cpp
	new file:   New_ER/source/Piece.cpp
	new file:   New_ER/source/Problem.cpp
	new file:   New_ER/source/Segment.cpp
	new file:   New_ER/source/SegmentProblem.cpp
	new file:   New_ER/source/Solution.cpp
	new file:   New_ER/source/Task.cpp
	new file:   New_ER/source/TestBB.cpp
	new file:   New_ER/source/main.cpp
	new file:   .gitignore
Merge https://github.com/margauxN/CECSP

Conflicts:
	New_ER/bin/le_nom
	New_ER/header/Problem.h
	New_ER/header/Solution.h
	New_ER/header/TestBB.h
	New_ER/source/LinearFunction.cpp
	New_ER/source/Problem.cpp
	New_ER/source/Segment.cpp
	New_ER/source/Solution.cpp
	New_ER/source/TestBB.cpp
	New_ER/source/main.cpp

modified:   New_ER/header/Problem.h
	modified:   New_ER/header/Solution.h
	modified:   New_ER/header/TestBB.h
	modified:   New_ER/source/LinearFunction.cpp
	modified:   New_ER/source/Problem.cpp
	modified:   New_ER/source/Segment.cpp
	modified:   New_ER/source/Solution.cpp
	modified:   New_ER/source/TestBB.cpp
	modified:   New_ER/source/main.cpp