labs 5 and 6
Merge pull request #12 from Ash927/master

lab 5 and 6 commit