added file1
Merge branch 'master' of https://github.com/fhtw/thorstensen_hoermann