thomas added
Merge branch 'master' of https://github.com/fhtw/hofer_eizinger_streiter