Added composer.json file
Merge origin/master