added classes for lab 4, part 1
Merge remote-tracking branch 'upstream/master'
Updated Join so that the tests pass. FINALLY!