up
Merge branch 'master' of
https://github.com/adrienrouquet/cpe-tphautedispo.git

Conflicts:
	cpe-tphautedispo/.classpath
gitigore classpath + settings
delete classpath + settings
Merge branch 'master' of
https://github.com/adrienrouquet/cpe-tphautedispo.git

Conflicts:
	cpe-tphautedispo/.classpath