new file dev.txt
Merge branch 'dev'
Finish git.txt