+ sss.txt
+ Added zzz
Merge branch 'origin/masta2'