con algo de css
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/core/configuracion.php
	app/core/html_tag.php
	app/core/idioma.php
	app/core/random_string.php
	app/core/session.php
	app/core/usuario.php
	app/modelos/empleados.php
	app/vistas/empleados/index.php
	app/vistas/plantilla_principal.php
	db_definition/daw2_inserts.sql
	index.php
	recursos/css/principal.css