commit
whatever
Merge branch 'master' of https://github.com/eurojulien/LOG720-Lab1.git

Conflicts:
	LOG720-A14-Lab1-serveur/pom.xml