Create composer.json
Update composer.json
stupid, stupid, stupid!!
Update composer.json
Merge branch 'master' of https://github.com/martha-ci/core

Conflicts:
	composer.json