Initial UI stuff.
Merge remote-tracking branch 'origin/master'

Conflicts:
	naviDration/AndroidManifest.xml
	naviDration/naviDration.iml
	naviDration/res/values/strings.xml
	naviDration/src/com/example/navidration/MainActivity.java
	naviDration/src/com/example/navidration/map.java
Lost pieces from merging UI stuff