Merge pull request #3 from farahfouladi/master

lab 3 milestone pull
Merge pull request #15 from lyeary/master

Merge pull request #3 from farahfouladi/master