My homework
Merge pull request #12 from markov94ggiz/master

My homework