fixing merge conflicts

Author: David Accomazzo

colortest.py

@@ -1,6 +1,5 @@
 #!/Users/accomazzod/Projects/web/python_colors/bin/python3
 """ Resources
-
     * https://www.lihaoyi.com/post/BuildyourownCommandLinewithANSIescapecodes.html
       * Good resource on how to manipulate terminal commands with Python
     * https://askubuntu.com/questions/821157/print-a-256-color-test-pattern-in-the-terminal
@@ -17,14 +16,9 @@
         * How WCAG defines contrast
 
     TO DO:
-
-    * Figure out a way to check the contrast between foreground and background and only
-      display the combos with high contrast. This should be broken out into
-      a separate function.
-      * This is done but maybe should use contrast calculations instead of deltas.
+    Convert to using WCAG contrast definitions instead of delta calcs
 """
 
-
 # Python colors
 import sys
 import argparse