Merge pull request #2 from walkerke/gh-pages

merge gh-pages with master
sample japan presentation