Merge branch 'color_edits'
Merge branch 'master' of https://github.com/rileywho/nodetest