First commit
Merge pull request #1 from cptnhaddock/Test-of-branching

First commit from test of branching