'aaa'を追加
Merge branch 'master' of https://github.com/elnikkis/marge-practice

Conflicts:
	miko.txt