Sincronizar todo
Merge branch 'master' of https://github.com/burusukuku/ejemplo

Conflicts:
	.idea/workspace.xml
	app/routes.php