nothing
Merge branch 'master' of https://github.com/ilantc/NeedARide
a
a
Merge branch 'master' of https://github.com/ilantc/NeedARide

Conflicts:
	res/layout/activity_taxi_planner.xml
a