commit states

agrega estados
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/Bikeapp.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/android/support/v7/appcompat/R$layout.class
	bin/classes/com/example/bikeapp/AlertFragment.class
	bin/classes/com/example/bikeapp/HomeFragment.class
	bin/classes/com/example/bikeapp/Perfil.class
	bin/classes/com/example/bikeapp/R$id.class
	bin/classes/com/example/bikeapp/R$integer.class
	bin/classes/com/example/bikeapp/R$layout.class
	bin/classes/com/example/bikeapp/R$menu.class
	bin/classes/com/example/bikeapp/R$raw.class
	bin/classes/com/example/bikeapp/R$string.class
	bin/classes/com/example/bikeapp/R$style.class
	bin/classes/com/example/bikeapp/R$styleable.class
	bin/classes/com/example/bikeapp/TipsFragment.class
	bin/classes/com/facebook/android/R$drawable.class
	bin/resources.ap_
	gen/android/support/v7/appcompat/R.java
	gen/com/example/bikeapp/R.java
	gen/com/facebook/android/R.java
	src/com/example/bikeapp/HomeFragment.java