compose.json added
Merge branch 'master' of https://github.com/2manypeople/config
composer modified