aaa
Merge branch 'Jhoel' of https://github.com/capotapps/Prueba.git into
Jhoel

Conflicts:
	HouseExpenses/bin/jarlist.cache
	appcompat_v7/bin/android-support-v7-appcompat.jar
aqui va la clase bitch
aqui va el restod bitch
Merge branch 'Jhoel' of https://github.com/capotapps/Prueba.git into
Jhoel

Conflicts:
	appcompat_v7/bin/android-support-v7-appcompat.jar