remove
Merge branch 'master' of github.com:waldo2188/SatisDynamique

Conflicts:
	composer_satis.json