introduction d'un conflit
Merge branch 'master' of https://github.com/rheami/lab_git

Conflicts:
	src/intense1/Intense1.java