Branch change for to make fun
testing a merge
Merge pull request #5 from clemtine/branch-chris

Testing a potential merge conflict