fixed
Merge branch 'master' of github.com:HearstDigitalStudios/team

Conflicts:
	locations.geo.json