Updated version of joined system and pieces
Merge branch 'master' of https://github.com/ChiTheHotDogGuy11/WatershedExhibit