playing around with composer
Merge branch 'master' of https://github.com/DaSteph/test-rest.git

Conflicts:
	composer.json
	composer.lock