Add composer.json
Merge branch 'composer'