add from local2
Merge branch 'master' of github.com:y6otanaka/tutrial

Conflicts:
	sample.txt