Wrapping up a few last files
Merge pull request #10 from shayhowe/new_colors

Wrapping up a few last files