Start
Merge branch 'master' of github.com:melkir/Odefor

Conflicts:
	src/up5/mli630/tutore1314/test/FormationLMI1.java
A terminer
change
ok
Modibo modif
Modibo modif
Merge branch 'master' of github.com:melkir/Odefor

Conflicts:
	ModeleL3AA1/Data.txt
	bin/up5/mli630/tutore1314/test/Data.class
	bin/up5/mli630/tutore1314/test/FormationLMI1.class
	bin/up5/mli630/tutore1314/util/IO.class
	src/up5/mli630/tutore1314/test/FormationLMI1.java