update
Merge branch 'gh-pages' of https://github.com/abeta/brightonjapan into gh-pages