Maaf kak telat:(

bigrandom/answer.py

@@ -1,6 +1,36 @@
 class BigRandom:
     def __init__(self):
         self.data = "data.txt"
+<<<<<<< HEAD
+
+
+    def answer(self):
+        noh = 0 
+        suc = 0 
+        a = open("data.txt","r")
+        s=0
+        for x in a :
+            s+=1
+            t=0
+            tmp=0
+            for y in x:
+                t+=1
+                for z in y:
+                    if (t == 1 and z != "#"):
+                        tmp += ord(z)
+                    if (z=="#"):
+                        noh +=1
+                    else :
+                        suc += ord(z)
+                if (t==1):
+                    suc-=tmp
+        a.close()
+        noh -= s
+        return (noh,suc)
+
+b= BigRandom()
+print (b.answer())
+=======
         # add attributes if you need more
 
     def answer(self):
@@ -13,4 +43,5 @@ def answer(self):
 
         return (noh,suc)
 
-    # add methods if you need more
+    # add methods if you need more
+>>>>>>> 64e1f92e25e7147b206ac73695e846881e7f9b0d

caesar/answer.py

@@ -1,6 +1,25 @@
 class Caesar:
     def __init__(self):
         self.ciphertext = "ciphertext.txt"
+<<<<<<< HEAD
+
+
+    def answer(self):
+        key = 46 
+        a = open("ciphertext.txt","r")
+        x =""
+        for i in a:
+        	for y in i:
+        		tmp = ord(str(y))-key
+        		if (tmp<0):
+        			tmp += 127
+       		x += chr(tmp)
+        print (x)
+        return (key)
+
+b= Caesar()
+print (b.answer())
+=======
         # add attributes if you need more
 
     def answer(self):
@@ -10,4 +29,5 @@ def answer(self):
 
         return (key)
 
-    # add methods if you need more
+    # add methods if you need more
+>>>>>>> 64e1f92e25e7147b206ac73695e846881e7f9b0d