Add composer.json (and .lock) to master