commit

comm
Merge

Conflicts:
	bin/Bikeapp.apk
	bin/classes.dex
	bin/classes/com/example/bikeapp/AlertFragment$2.class
	bin/classes/com/example/bikeapp/AlertFragment$3.class
	bin/classes/com/example/bikeapp/AlertFragment$4.class
	bin/classes/com/example/bikeapp/AlertFragment$5.class
	bin/classes/com/example/bikeapp/AlertFragment$6.class
	bin/classes/com/example/bikeapp/AlertFragment.class
	src/com/example/bikeapp/AlertFragment.java