un poc de tot
Merge remote-tracking branch 'origin/Aitor'

Conflicts:
	AppSineDolore/bin/jarlist.cache
	CaptureActivity/bin/captureactivity.jar
	DondeEstanMisAmigos/bin/DondeEstanMisAmigos.apk
	DondeEstanMisAmigos/bin/classes.dex

DondeEstanMisAmigos/bin/classes/com/example/dondeestanmisamigos/Registro
.class
	DondeEstanMisAmigos/bin/resources.ap_