p
Merge branch 'master' of https://github.com/aminebtk/projet4.git

Conflicts:
	src/ProcessusTokenRing/EmissionProcRessource.java
	src/ProcessusTokenRing/ProcTokenRing.java
	src/main.java
	src/ressources/InterfaceRessource.java
	src/ressources/ReceptionRessource.java
	src/ressources/Ressource.java