Merge pull request #1 from jersme/branch1

Merged test file out of branch 1 to master
Merge pull request #2 from jersme/master

Merge pull request #1 from jersme/branch1 huh?