aaaって書いたよ。
Merge branch 'hagi' of https://github.com/Qwerty-Zenkun/test into hagi

Conflicts:
	abc.txt