ended the challenge friends user history
Merge branch 'master' of https://github.com/prestrepoh/FutbolistApp

Conflicts:
	app/routes.php