Minion avec torche
Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

Conflicts:
	Library/metadata/bd/bd1c34707fdd28145a4734cc2e8a46f2