Assigment 6 completed
Merge pull request #228 from vktrsm/master

OK