Correction syntaxe
Merge branch 'master' of github.com:Aluriak/ProjetL3

Conflicts:
	src/gui/chronometre.rb