messing around with color output
finished moving color calls to print_with_color
Merge branch 'colour'