Updated Map Activity
Updated Map Activity
Updated Map Activity Retry Commit
Re-re-try?
Merge branch 'master' of https://github.com/karatesaul/UcscMap

Conflicts:
	UCSCMap/project.properties
	UCSCMap/src/com/example/ucscmap/MapActivity.java