add c files
merging
Merge branch 'dev'