scene change
fixed merge conflict
Merge branch 'master' of github.com:cbranch101/nerve-center
Merge branch 'master' of github.com:cbranch101/nerve-center
edited to add power switch, but found there was no controller
got the basics of the switch working
got switch working in a basic way