initial commit
message
Merge branch 'master' of https://github.com/pkirschn/lab4