Homework
Merge pull request #2 from de1mos242/upstreammaster

Homework 7