added sub_branch.txt, edited main.txt / sub.txt
deleted subsub.txt
Merge branch 'sub_branch'