made and overlay...finally
Merge branch 'master' of https://github.com/adebigare/NatGeoFoodHack into Adrienne
more map changes
more mapping funtimes
committing changes to map
changing NULL to null for js
Merge branch 'master' into Adrienne

Conflicts:
	data/Kenya_districts98/kenya_districts98.json
Merge branch 'master' into Adrienne2

Conflicts:
	public/javascripts/main.js