Merge pull request #118 from jateeter/master

modified colors to agree with www.greenbuttondata.org
Merge remote-tracking branch 'upstream/master'