Merge pull request #1 from okbm/devel

devel追加
Merge branch 'devel' of github.com:okbm/practice into devel
feature2
Merge pull request #5 from okbm/feature-test2

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

Conflicts:
	sample.txt
Merge pull request #7 from okbm/feature

Feature