algo
Merge branch 'master' of https://github.com/Wawser/WamadeusV1

Conflicts:
	app/views/usuario/proyecto-estadisticas.blade.php