Merge pull request #23 from lyeary/master

ex7
added code for lab5
lab5 pull Merge branch 'master' of https://github.com/michaelghay/cosc460
Merge pull request #8 from farahfouladi/master

m