a
a
Deleted unused files. Keep those in the menu package that may be used
later.

Merge branch 'master' of https://github.com/vfonte91/TaxiMap

Conflicts:
	AndroidManifest.xml
	project.properties
gbranc 'master' of https://github.com/vfonte91/TaxiMap

Conflicts:
	src/com/example/taximap/map/MapViewActivity.java

t
quit
quit#
Merge branch 'master' of https://github.com/vfonte91/TaxiMap