sample側のsample.cを編集
Merge branch 'master' of https://github.com/youjirec/sample_git

Conflicts:
	sample/sample.c