akawajaを追加
AKAJAWAKUNを追加
Merge branch 'master' into AKAJAWA

Conflicts:
	hoge.txt
commit
delete some words