colors and a few new tests
Merge pull request #25 from maryschmidt/colors

colors and a few new tests