change in branch_merged
Merge branch 'branch_merged' of github.com:htw-imi-info3/gitdemo_group2