Merge pull request #48 from lyeary/master

lab6 milestone1 merge
ugh
Merge pull request #22 from farahfouladi/master

mergggggge