new test file for Markus
moved status 3 things and merged
Merge pull request #55 from mstoye/Markus_test

Markus test