stuff
Merge branch 'master' of github.com:marykw/RBOR
rough draft of settings panel