Merge branch 'master' into gh-pages
using iframe for the map
fixing the position of takumi image