３行目と７行目を変更
Merge branch 'master' of github.com:halenohi/git_learning

Conflicts:
	numbers.txt