some modif

d'autre modification
Merge remote-tracking branch 'origin/master'

Conflicts:
	1-arithmetic/.cache
	1-arithmetic/bin/fos/Arithmetic$.class
	1-arithmetic/src/main/scala/fos/Arithmetic.scala