Se trabaja la FachadaConsumo
Merge branch 'master' of https://github.com/gformica/Innova

Conflicts:
	src/innova/Consumo.java
Se termina FachadaConsumo