add  newmaster.txt
modify dev.txt
fixed conflict
mod de
merge fixed bug
gitRepo
del all from gitRepo
modify dev gite
commit dev.txt