Merge pull request #1 from okbm/devel

devel追加
Merge branch 'devel' of github.com:okbm/practice into devel
ttttから追加
aaaaaaaaaaaaaaaaa
Merge branch 'feature-tttt' into feature
Merge branch 'feature' of github.com:okbm/practice into feature

Conflicts:
	sample.txt