Merge pull request #1 from IanChar/map

Made the basic layout of the main screen
Merge branch 'master' into map
Can now place a marker or get current location