1,2行目に絵文字,5行目に文字を書きました。
１行目〜４行目ひらがな入力
Merge branch 'motimotimoti'
Merge remote-tracking branch 'origin/master' into ramuniku29

Conflicts:
	numbers
Merge remote-tracking branch 'origin/master' into aya0

Conflicts:
	numbers
Merge branch 'ramuniku29'
Merge remote-tracking branch 'origin/master' into aya0

Conflicts:
	numbers