Merge branch 'master' of /Users/jojo/Documents/Projet/georace with conflicts.