second branch commit
Merge pull request #2 from samstreuli/newbranch

second branch commit