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
Merge pull request #30 from clc4/master

Adds inventory and anagram view/activity
Added Material class and preparing for merge upstream
Implemented current location and populating geolocation of materials
Haven't tested anything, markers placed on map
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
Trying to prepare for a cleaner merge
Update .gitignore

Trying to make merging easier
Deleted the bin files for easier merging
Removed bin files from tracking
Merge branch 'master' of https://github.com/GoogleJump/Diversity

Conflicts:
	ParseStarterProject/AndroidManifest.xml
	ParseStarterProject/gen/com/parse/starter/R.java
	ParseStarterProject/res/values/strings.xml
	ParseStarterProject/src/com/parse/starter/Material.java
Git didn't auto merge correctly
Eclipse was being dumb. Works
Changed references from item to material