added character k in the font straight

Author: XARTAN21

Fonts/Straight/straight.h

@@ -439,17 +439,18 @@ char **Z()
 
     */
 
-    /*
+    
         char **k()
         {
             char **character = getCharGrid();
 
-            //Enter the character grid in ROWS X COLS
+            character[1][0]=character[2][0]='|';
+            character[2][1]='(';
 
             return character;
         }
 
-    */
+    
 
     char **l()
         {

example.cpp

@@ -6,10 +6,6 @@ using namespace ascii;
 int main()
 {
     Ascii a = Ascii(straight);
-<<<<<<< HEAD
-    a.print("b");
-=======
-    a.print("Z");
->>>>>>> 466139e72321fe1b9389e6b9ae81d8abce3f5354
+    a.print("k");
     return 0;
 }