changed linear to relative in form_basic_ride.xml
Merge branch 'master' of https://github.com/ilantc/NeedARide

Conflicts:
	AndroidManifest.xml
	bin/AndroidManifest.xml
	bin/NeedARide.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/example/needaride/MainActivity.java