Update composer.json
Merge branch 'master' of github.com:ChaosPower/laravel-social

Conflicts:
	composer.json