Merge pull request #23 from farahfouladi/master

woot more tests
working on recovery 7/10
Merge pull request #50 from lyeary/master

lab 6