Add exercise on branching
Modify dummy changes in merge
Specify editor and add note about commit -am