Commit pour conflit
Merge branch 'master' of https://github.com/lchuiton/spm

Conflicts:
	ServeurSPM/serveur.js