homework 2
Merge pull request #1 from sebastiantues/master

homework 2