now it works

rsa1/description.md

@@ -1,5 +1 @@
-<<<<<<< HEAD
 I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
-=======
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
->>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657

rsa1/description.md.BACKUP.129.md

@@ -1,8 +0,0 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
-=======
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
->>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
-=======
->>>>>>> f9a58afef003d40f3ada9c1645eda26363521cf3

rsa1/description.md.BACKUP.137.md

@@ -1,8 +0,0 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
-=======
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
->>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
-=======
->>>>>>> f9a58afef003d40f3ada9c1645eda26363521cf3

rsa1/description.md.BACKUP.20.md

@@ -1,8 +0,0 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
-I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
-=======
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
->>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657
-=======
->>>>>>> f9a58afef003d40f3ada9c1645eda26363521cf3

rsa1/description.md.BASE.129.md

@@ -1 +0,0 @@
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.

rsa1/description.md.BASE.137.md

@@ -1 +0,0 @@
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.

rsa1/description.md.BASE.20.md

@@ -1 +0,0 @@
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.

rsa1/description.md.LOCAL.129.md

@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
-=======
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
->>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657

rsa1/description.md.LOCAL.137.md

@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
-=======
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
->>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657

rsa1/description.md.LOCAL.20.md

@@ -1,5 +0,0 @@
-<<<<<<< HEAD
-I found somebody's notes on their private RSA! Help me crack [this](${ciphertext_txt}).
-=======
-We came across another [message]($rsa3) that follows the same cryptographic schema as those other Really Scary Admin messages. Take a look and see if you can crack it.
->>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657

rsa1/grader.py

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 from cStringIO import StringIO
 
 flag = "wh3n_y0u_h4ve_p&q_RSA_iz_ez"
@@ -48,9 +47,3 @@ def grade(random, key):
     if key.find("%s_%s" % (flag, salt)) >= 0:
         return True, "Correct!"
     return False, "Nope."
-=======
-def grade(autogen, key):
-    if key.find("tw0_v3ry_merrry_tw1n_pr1m35!!_417c0d") != -1:
-        return True, "Really Superb! Applause!"
-    return False, "RIP"
->>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657

rsa1/problem.yml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 title: RSA 1
 author: neptunia
 hint: Go google RSA if you're stuck.
@@ -6,14 +5,3 @@ category: Cryptography
 autogen: true
 programming: false
 value: 25
-=======
-author: blockingthesky
-title: RSA 3
-hint: You might want to read up on how RSA works.
-category: Cryptography
-autogen: false
-programming: false
-value: 70
-files:
-  - rsa3
->>>>>>> 93577ddee37a489cf0aa1a4b987d23a3bc3d2657

rsa1/rsa3

@@ -1,2 +0,0 @@
-{N : e : c}
-{0x27335d21ca51432fa000ddf9e81f630314a0ef2e35d81a839584c5a7356b94934630ebfc2ef9c55b111e8c373f2db66ca3be0c0818b1d4eda7d53c1bd0067f66a12897099b5e322d85a8da45b72b828813af23L : 0x10001 : 0x9b9c138e0d473b6e6cf44acfa3becb358b91d0ba9bfb37bf11effcebf9e0fe4a86439e8217819c273ea5c1c5acfd70147533aa550aa70f2e07cc98be1a1b0ea36c0738d1c994c50b1bd633e3873fc0cb377e7L}