updated
updated
Merge branch 'master' of https://github.com/robertjskelton/Simulated-Hurricane-Migration-Visualization

Conflicts:
	map.js