Assignment of student 0856777
Merge pull request #8 from LukasRetschi/master

Assignment of student 0856777