first
added CNAME
added stuff
added min
Merge branch 'gh-pages'

Conflicts:
	Gruntfile.coffee
	build/main.css
	build/main.js
	build/main.min.js
	data/about.json
	data/map.geojson
	index.html
	src/index.jade
	src/main.coffee
	src/main.less
removed shit
fixes
Merge branch 'master' of https://github.com/wanderer/Detroit-Farm-Map

Conflicts:
	data/map.geojson