CAmbio a vista de reportes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/reportes.blade.php