いじりました　by kiriyama
Merge branch 'master' of https://github.com/ValLaboratory/git-practice

Conflicts:
	numbers.txt