changes were made
more minor changes, added tabs
Merge branch 'master' of https://github.com/sgreenstein/salk-a
Merge branch 'master' of https://github.com/sgreenstein/salk-a
view for control panel
minor change