First Steps
Clase Sede terminada
Merge Manual
BoilerWorker finished
Merge branch 'gdrooid-master' of https://github.com/gdrooid/termonator

Conflicts:
	Boiler.java
Merge branch 'gdrooid-master' of https://github.com/gdrooid/termonator

Conflicts:
	Boiler.java
Termonator.ice Good good very well fandango
Site_Server Finished without test
Termonator.ice for Dani
Merge branch 'dagu92-master' into gdrooid-master

Conflicts:
	Boiler.java
Código mejorado