testing stuff
Merge pull request #1 from ostranme/testmerge

testing stuff