First Steps
Clase Sede terminada
Merge Manual
Tabulaciones a espacios
Anadida clase del controlador
Fixed stupid java not being C
Arreglado errores de proxy
BoilerWorker finished
Terminadas funciones de la caldera
Funciones actualizadas para usar 'secret'
Merge de Termonator.ice
Merge branch 'gdrooid-master' of https://github.com/gdrooid/termonator

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

Conflicts:
	Boiler.java
Termonator.ice Good good very well fandango
Añadida función getHeatingTemperature
Site_Server Finished without test
typo solucionado
Termonator.ice for Dani