labs 2 and 3 commit
Merge pull request #7 from Ash927/master

labs 2 and 3 pull