juggle
sucemabiteMerge branch 'master' of https://github.com/Simeonn67/ProjetProgDistrib

Conflicts:
	Makefile