adding stuff
merge conflicts
Merge pull request #10 from mikehermes/adding-colors

adding stuff