Changed start screen to login
Merge branch 'master' of https://github.com/vfonte91/TaxiMap

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

Conflicts:
	AndroidManifest.xml