test of fork
Merge remote-tracking branch 'origin/Cole'
Merge branch 'John'
Merge pull request #7 from bittelc/master

test
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
main.js color sensor working

color sensor working now, for most colors
color outputs

fixed some color output colors
main.js improved color output

showing rectangles for color outputs
Merge branch 'master' into John