fixed merge again

tbchat.c

@@ -46,14 +46,6 @@ uint8_t ceil(const uint8_t n, const uint8_t d);
 
 void ram(void)
 {
-<<<<<<< HEAD
-    FIL f;
-    f_open(&f, "wurst", 0);
-    unsigned char *msg;
-    uint8_t key = BTN_NONE;
-
-=======
->>>>>>> f10d3afd99be7b634123cdf6798aa1167802e295
     lcdClear();
     lcdPrintln("OK r0ket ready.");
     lcdPrintln("Press any button.");
@@ -102,8 +94,7 @@ void ram(void)
     }
 }
 
-<<<<<<< HEAD
-// a1 and a2 are 
+// a1 and a2 are answer arrays
 uint8_t match(const unsigned char const * a1, const unsigned char const * a2, const uint8_t n) 
 {
     uint8_t score = 0;
@@ -113,7 +104,7 @@ uint8_t match(const unsigned char const * a1, const unsigned char const * a2, co
     }
     return score;
 }
-=======
+
 // Copy from filesystem/util.c since the function is not exported
 int readTextFile(char * filename, char * data, int len){
     UINT readbytes;
@@ -123,7 +114,6 @@ int readTextFile(char * filename, char * data, int len){
         data[readbytes]=0;
     return readbytes;
 };
->>>>>>> f10d3afd99be7b634123cdf6798aa1167802e295
 
 uint8_t ceil(const uint8_t n, const uint8_t d) 
 {
@@ -174,7 +164,7 @@ void send_msg(unsigned char *msg)
 void initQuestions(struct Question* const questions)  
 {
     questions[0].text="Do you like men?";
-    questions[0].up="Yes";
+    questionThank you very much for your feedback.s[0].up="Yes";
     questions[0].down="No";
 
     questions[1].text="Favourite Editor?";