takemura html
takemura html
hoge1
character set change
Merge branch 'master' into takemura_html

Conflicts:
	index.html
Merge branch 'takemura_html'