Merge branch 'master' of https://github.com/edrinkercope/Community-Garden-Planner

Conflicts:
public/javascripts/mapStuff.js
public/javascripts/my.js
public/stylesheets/graphs.css
views/index.mustache