query 4, need to get the joins to work
Merge branch 'master' of github.com:jyhung/eecs484-proj2