Update composer.json
Merge remote-tracking branch 'remotes/github/0.0.1'

Conflicts:
	composer.json