Merge branch 'dev'
re-organized file structrue
fix circles color
readme
fix country name mapping
Merge branch 'dev' of github.com:CSE512-14W/a3-chaoyu-aniket into dev
Merge branch 'dev'
Merge branch 'master' into gh-pages