Petit morceau de commit
Merge branch 'master' of github.com:HEB-ESI/DEV1-JAV-Slides

Conflicts:
	sources/java1-presentation-master.tex