Fixed join query
Merge branch 'master' of https://github.com/dtkelch/cis353