Merge pull request #1 from farahfouladi/master

updates from farah's repo - 9/12 @12pm
debugging seqscan
Merge pull request #4 from lyeary/master

code implemented for ex6 -- just debugging (unit test not passing)