Assignment of student 1055086
Merge pull request #9 from tschoiss/master

Assignment of student 1055086