Tests revisados
Merge branch 'pau' of https://github.com/urisan23/proyectostw into pau

Conflicts:
	views/layout.haml
Tests actualizados