new commit
sample.c edited
trying to commit
Merge branch 'dev_1.0'