testing
Merge pull request #2 from gmiesch/testing

Made a new testing branch