initial commit, what we submitted as assignment3
Merge pull request #1 from MartinOrtel/assignment3

initial commit, what we submitted as assignment3