Edited composer file
Merge branch 'master' of https://github.com/Jazzn/cLeague

Conflicts:
	composer.json