Inital Try
Tweaked so that it works with D3
Merge branch 'master' into Sinatra-Setup
Moved worldmap
Merge branch 'Sinatra-Setup'