Adding comments for Cole

Cole learning code
Merge branch 'master' into Cole
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'
RGB label colors and clean
Merge branch 'master' into Cole

Conflicts:
	js/main.js
Merge branch 'Cole'
Merge branch 'John'
Merge branch 'John'
Merge branch 'John'

Conflicts:
	js/main.js
fixed conflicts

fixed conflicts
Merge branch 'master' into John