more stuff
thing
Merge pull request #2 from fredryk/testing

Testing