archivos
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/views/enConstruccion.blade.php
	public/assets/images/logo.PNG