Merge branch 'master' of /home/edouard/IdeaProjects/bowlingServeur with conflicts.
Refacto