final y revisado
Merge branch 'master' of https://github.com/KatrinB/Redes

Conflicts:
	Ener-Proy1/bomba
	Ener-Proy1/centro
	Ener-Proy1/centro.c