good
bad
not goog
fixed conclict
change something
master modified
change in dev
fixed conflicts
add a c code ->helloworld
code for helloworld in master
code helloworld in dev
use dev
change fie in dev
change in branch dev
mrege with on ff
change reame.txt in dev
add master.c in master branch
add dev.c in branch dev
Merge branch 'dev'