added a line about branching
confused about branching
Merge branch 'master' into add-info
Merge branch 'branch-confusion'