commit pour junit
Merge branch 'master' of https://github.com/fprieur/simulation1-inf6150-e2013

Conflicts:
	Sim1/test/Tp2_1Test.java