Merge branch 'master' into demo

1 files changed, 0 insertions, 22 deletions

diff --git a/src/Model/Color.elm b/src/Model/Color.elm
deleted file mode 100644
index 49ece2b..0000000
--- a/src/Model/Color.elm
+++ /dev/null
@@ -1,22 +0,0 @@
-module Model.Color exposing
-  ( Color
-  , htmlOutput
-  , mergeColors
-  )
-
-type alias Color =
-  { red : Int
-  , green : Int
-  , blue : Int
-  }
-
-htmlOutput : Color -> String
-htmlOutput color = "rgb(" ++ (toString color.red) ++ ", " ++ (toString color.green) ++ ", " ++ (toString color.blue) ++ ")"
-
-mergeColors : Float -> Color -> Color -> Color
-mergeColors ratio c1 c2 =
-  let mergePart x y = truncate (ratio * (toFloat x) + (1 - ratio) * (toFloat y))
-  in  { red = mergePart c1.red c2.red
-      , green = mergePart c1.green c2.green
-      , blue = mergePart c1.blue c2.blue
-      }