Change-Id: I3e016dc5eadc7774490068ad1c3f1b65dda360b5
Merge branch 'master' of https://github.com/manucv/ControlGastos.git
Merge branch 'master' of https://github.com/manucv/ControlGastos.git
Change-Id: I6d8c8d156e2a5b2890ec9258a446afc02ce835d1
Merge branch 'master' of https://github.com/manucv/ControlGastos.git

Conflicts:
	E-R/README.txt

Change-Id: Ibc01bb279d815f980656e5f6ea7927d72f64a5a3