experiment 2 more work
Merge branch 'master' of github.com:nrubin/CircuitsLab8
resolve merge conflict
add ro macro