add new file dev.txt
information added from bug1
information added from bug2
information added from bug1
add information after merge conflict
add main.c to f1
add main.c in f2
Merge branch 'dev' of github.com:landisliu/learnnewgit into dev
add main.c after merge