bug fix
Merge branch 'master' into bug_fix

Conflicts:
	ProjetInitiationGitHub/src/toto/Titi.java
Merge remote-tracking branch 'origin/master'