seb MAJ sendPaquet 16/06 15h22
Merge branch 'master' of https://github.com/eltonio450/modal.git

Conflicts:
	src/Stockage/Donnees.java
	src/Stockage/SendPaquet.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/Stockage/SendPaquet.java