Branching test
Merge pull request #1 from stianskj/Test

Branching test