Add some stuff through a branch
Merge pull request #1 from thorbjornmartsum/testbranch

Add some stuff through a branch