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

Conflicts:
	bin/AndroidManifest.xml