ajout trap et serialisation
Merge branch 'master' of https://github.com/antoussaka/projet_sse

Conflicts:
	sse/client/src/Makefile
	sse/client/src/main.cpp