Updated logic for join.cpp to call correct fn
Merge branch 'master' of github.com:Qmando/484-P4