Created methods in Color model
Fixed merge conflicts