Merge pull request #19 from lyeary/master

merging write up
3/4 tests pass for exercise 4, lab 4
TableStats tests pass
lab4 ex4
working on join op not quite working
join optimizer and query tests are passing
Merge pull request #21 from lyeary/master

questions
Merge pull request #6 from farahfouladi/master

merge