Another test commit. ホゲ問題
Merge branch 'master' of github.com:dmiyakawa/test_article

Conflicts:
	sample.re