Switched master branch to use the non-CAD plant variant
Colored blocks blue
resolved conflict?
Returned block colors to white
derr derr
Merge pull request #1 from pravallika-v/master

PV Test merge
Moved model to the right monitor because PV saved it to appear off screen
Merge branch 'master' into branch2