minor changes
Merge branch 'master' of github.com:cbranch101/social-control-room
stuff
fixed merge conflict
random changes
fixed merge conflict
got a simple, wonky version of the lever control working