david no ha cambiado nada
Merge branch 'master' of
https://github.com/CarlosGonzalezGonzalez/Torvall-14-15

Conflicts:
	repositorioEmpleado/resources/empleados