Merge branch 'John'
Merge branch 'John'
Merge branch 'master' into Cole
Merge branch 'master' into Cole
get ready for colorID output ready to go
edit out non-functional colorID

still work needs to be done on getting colorID values and determining
what output actually means
Merge branch 'John'
colorID output ready
Merge branch 'Cole'

Conflicts:
	js/main.js
resolve conflicts
Merge branch 'John'
Merge branch 'master' into John