pruebas
Merge branch 'master' of
https://github.com/CarlosGonzalezGonzalez/Torvall-14-15.git

Conflicts:
	repositorioEmpleado/src/es/torvall/Employee.java