test commit
modified pom.xml
modification
modification1
decommenter arima.java
avant de fetch
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/projets4/case1/basic/Arima.java
decommenter arima.java
avant le fetch
version test