commiting map changes before post GIS
all locations displaying on google maps
precompiled
Merge branch 'kaitlin2'
mergin in maps and corrected api routes
Conflicts:
	Gemfile.lock.orig