Merge pull request #41 from bchiatt/locations

Locations
map is showing up