Cuentas
Merge branch 'master' of https://github.com/argentito/gone_with_the_wind

Conflicts:
	db/cuentas
	mediador.c
comments