Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
changing the font
updating
no underline
removing the link to about tamoya and so on
using js to visualize map
updating
updating
updating
updating
Merge branch 'gh-pages'