add buttons in the main activity
dummy commit
Merge branch 'master' of https://github.com/ilantc/NeedARide

Conflicts:
	bin/NeedARide.apk
	bin/classes.dex
	bin/resources.ap_
	res/layout/activity_main.xml