Merge confict fix
Merge branch 'master' of github.com:ChiTheHotDogGuy11/WatershedExhibit