japanese translation
Merge branch 'master' into gh-pages

Conflicts:
	README.md
	index.html
	params.json
Merge branch 'gh-pages' of https://github.com/wenoki/callback-hell into gh-pages