C'est le commit de l'ambiance, le commit de l'ambiance !
Merge branch 'master' of https://github.com/BrunoMatry/cloudbook

Conflicts:
	HMI-JavaFX/serverConfig.txt