Fast-forwardテスト
Merge branch 'master' of https://github.com/tan1234jp/41hamamatsu_test

Conflicts:
	newfile.txt