Homework 2
Homework 3
Merge pull request #125 from Nikolas1814/master

homework