bringing over changes from Bryant
Merge branch 'master' of https://github.com/xela144/CAN-Python
its
had to go to MEMS design
treeview mostly working, need to fix scrollbars
mergetool again
talked with bryant
working from home minor changes