receviez
Merge branch 'master' of https://github.com/vdbulcke/ComputerNework-Cedric-FLO

Conflicts:
	projet1/code/receiver