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

Conflicts:
	public/stylesheets/style.css
more graphs
Merge branch 'master' of https://github.com/edrinkercope/Community-Garden-Spotter

Conflicts:
	public/stylesheets/style.css
merge
Better graphs. Better clicks. Better everything