こんにちは→ハローに変更
Merge branch 'master' of https://github.com/miami373/work

Conflicts:
	sample.html