get update
totoMerge branch 'master' of https://github.com/Simeonn67/ProjetProgDistrib

Conflicts:
	client_src/main.c
	common_src/person.c