added 2/3rds of the queries we need to do
Merge branch 'master' of https://github.com/yuxilin/CS143PROJ1B