preparing to pull master
marge conflicts resolved
Merge pull request #41 from bchiatt/locations

Locations