working with branches
Merge pull request #1 from samstreuli/testbranch

working with branches