Homework 3
Merge pull request #154 from Nikolas1814/master

Homework 3