added string constructor for colors
fixed merge conflict in image