add test
Merge branch 'hotfix'
Create newfile.c
Merge branch 'develop'
fix errors
Merge branch 'master' into develop