Miles de cosas

ds
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Bikeapp.apk
	bin/classes.dex
	bin/classes/com/example/bikeapp/AlertFragment.class
	bin/classes/com/example/bikeapp/TipsFragment.class
	bin/resources.ap_