seb
Merge branch 'master' of https://github.com/eltonio450/modal.git

Conflicts:
	src/Stockage/Donnees.java
	src/Stockage/Machine.java