Merge origin/master

Conflicts:
	src/labo_semaine4/Labo_semaine4.java
Merge origin/master