first commit
fixing map call
geolocation working; map and new view WIP
fixed conflicts
Merge pull request #6 from dvmonroe/implementing_geolocation

Friday NightMerge