Update with code for map
Merge branch 'master' of https://github.com/edrinkercope/Community-Garden-Planner

Conflicts:
	public/javascripts/my.js