C txt edited
Merge branch 'dev'