merging tokyo slides to gh-pages