date chagnes
Merge pull request #2 from danbjoseph/master

add layer control w/ 4 x data layers with teasers from tilemill (n/a for two)
changes
pulling daneils changes
adding elements at risk from OSM
Merge branch 'master' of https://github.com/AmericanRedCross/haiyan_dashboard

Conflicts:
	js/main.js
adding node server
adding forever