Seccond Commit
feature
er
Merge branch 'master' of https://github.com/fhtw/winterhalder_kreuzriegler into feature
Merge branch 'feature' of https://github.com/fhtw/winterhalder_kreuzriegler
Merge branch 'feature'