asd

asd
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Bikeapp.apk
	bin/classes.dex
	bin/classes/com/example/bikeapp/HomeFragment$1.class
	bin/classes/com/example/bikeapp/HomeFragment.class
	bin/classes/com/example/bikeapp/Main$1.class
	bin/classes/com/example/bikeapp/Main.class
	bin/classes/com/example/bikeapp/Perfil.class
	src/com/example/bikeapp/HomeFragment.java
	src/com/example/bikeapp/Main.java