Merge pull request #21 from farahfouladi/master

asdfasdfasdfasdfasdf
lab6 milestone1
Merge pull request #48 from lyeary/master

lab6 milestone1 merge