lab2
Merge pull request #8 from kopcap/master

lab2