MINOR update composer file and remove repo path
MINOR resolve marge conflict

Merge branch 'master' of github.com:fb3rasp/aws-s3-files

Conflicts:
	composer.json