added a branch
Merge pull request #1 from lmerkle02/testFeature

added a branch
merged feature2 and master