Added colors for fun and profit.
Merge branch 'colors'

Conflicts resolved in all files. Now has both version 1 functionality and changes colors.