lab5 done v.1.0
Merge pull request #54 from lewenhagen/master

lab5 done v.1.0