added composer.json
Merge origin/master