Added cat.txt in Cat Branch
Added admin1
Added admin2
Fixed bug
Merge branch 'admin'