GPSActivity kind of started

Committing to save info... not useful
merge conflicts resolved.
merge conflict resolved
just merged with master
Forgot to delete pseudoservercode in my fork
Added map view using Google Maps API
Map in map view. Going to attempt to add buttons now
Map View looks like mockup. Adding functionality next
Listeners attached. Transition to other views good. Working on
geolocation
doing some small thing to merge
Added Material class and preparing for merge upstream
Implemented current location and populating geolocation of materials
Haven't tested anything, markers placed on map
Pushing settings up
made main menu connect to character view
Added some comments
popups on settings done, popups on puzzle work in progress
Getting JSON fro Places API. JSON to POJO works.

Unusual error where app crashes after a few requests.
Got lat and lng of places where markers should go.

However, rendering the markers in an async task makes the app unhappy.
Basic functionality of MapsActivity View is implemented