added another branch f2
merged feature2 and master
Merge pull request #2 from lmerkle02/testFeature2

added another branch f2