add cat.txt
add newcat.txt
add m.txt in master
Merge branch 'dog'
newcar modify in car
modify newcat in master
Merge branch 'cat'

Conflicts:
	newcat.txt
modi in cat
modi in master
merge
Merge branch 'master' of https://github.com/mescoda/try_git