fix empty-result set why/why not
meeeeerge
Merge branch 'master' of github.com:watermelon91/eecs584f14