support joining in limited cases
Merge branch 'master' of github.com:Rob7045713/CMSC702project