Merge pull request #1 from kaysoky/merging_develop

Pulling changes from origin merging_develop
Merge pull request #2 from kaysoky/merging_develop

Updating my copy
Changed capitalization of RGB color "Yellow". The previous all caps version of YELLOW was not recognized and caused errors during the build.

Signed-off-by: j-cronin <jeneva.cronin@gmail.com>
Merge branch 'merging_develop' of https://github.com/j-cronin/NeuralSystemsBCI2000 into merging_develop
Merge pull request #11 from j-cronin/merging_develop

Changed text capitalization for the color Yellow for the target hit color.