Fixed composer.json ?
Merge branch 'master' of github.com:craftsmancoding/repoman

Conflicts:
	composer.json
	composer.lock