first branch!
Merge pull request #1 from smehus/first-branch-first

first branch!