cat.txt add
addding admin test
adding master.txt
Merge branch 'admin'
modify admin