Merge pull request #11 from zakszak/master

lab 06