Branches and merging

Work on separate lines of development and bring them back together.

Branches and merging