yoshiak_commit
Merge branch 'master' into yoshiaki

Conflicts:
	index.html
Merge pull request #2 from ychubachi/yoshiaki

yoshiak_commit