Added composer.json to the goodies.
Merge remote-tracking branch 'origin/master'