anderes
*bugfix
Merge pull request #1 from uucly/newFeature

*bugfix
blubb
Merge branch 'master' into testNewBranch