Merging scene changes
Merge branch 'develop' of https://github.com/UWMLI/thermo-golf into develop
Getting Scene updates
Jacob's push
Taking my changes to Scene