merge

Author: mzhang28

070-brutus.md

@@ -2,6 +2,8 @@
 
 *Written by Emily Leng*
 
+*Writeup by Jester*
+
 ## Problem
 
 It appears the only thing you know about the flag is its MD5 hash f54f10fd6e38929084d505d0c2e9c997, and that the flag is formatted in this way: [number][adjective][color][animal] without the brackets.

080-easy-as-ctf-gets.md

@@ -2,6 +2,8 @@
 
 *Written by Emily Leng*
 
+*Writeup by Jester*
+
 ## Problem
 
 What could this possibly mean?

090-pixelated.md

@@ -6,16 +6,26 @@
 
 <table align="center" border="0" cellpadding="1" cellspacing="1" style="width:500px"><tbody><tr><td><img alt="" src="1.png" style="height:200px; width:200px"></td><td><img alt="" src="2.png" style="height:200px; width:200px"></td></tr></tbody></table>
 
+*Writeup by Jester*
+
+## Problem
+
+<img src="http://i.imgur.com/LN4klWr.png"\>      <img src="http://i.imgur.com/ubk2fLw.png"\>
+>>>>>>> f22ce8d3eda8512263e1636b9cf9f949e256a958
+
 ## Hint
 
 Did you know you can do [arithmetic with images](http://homepages.inf.ed.ac.uk/rbf/HIPR2/arthops.htm) too?
 
 ## Solution
 
-By XORing the two images and turning the red pixels black, you can get a working QR!
+
+This problem is quite simple. The hint gives us an extremely useful website that allows us to perform "arithmetic" on the images provided. 
+
+After converting the pngs to the needed format on the website, you can simply try it out until you get a QR code. (Upload the images on a website) After trying all of them, we find that the correct QR code is actually XOR. Afterwards, you can scan the QR code, which links you to the flag.
 
 <img alt="" src="completed.png" style="height:200px; width:200px">
 
 ## Flag
 
-`pixelsmatterinQRs`
+`pixelsmatterinQRs`

150-ghoti.md

@@ -2,6 +2,8 @@
 
 *Written by Michael Zhang*
 
+*Writeup by Jester*
+
 ## Problem
 
 Haaaalppp I can't pronounce this word. What could this image mean?

160-obfuscation-2.md

@@ -2,6 +2,8 @@
 
 *Written by Austin Zhou*
 
+*Writeup by Jester*
+
 ## Problem
 
 This jumbled mess has been left for you... [source](obfuscate.js)

200-guessing-is-hard.md

@@ -1,6 +1,8 @@
 # 200 - Guessing is hard
 *Written by Jacob Edelman*
 
+*Writeup by MegaAbsol*
+
 ## Problem 
 
 We really love guessing games. Try and get the flag at python.easyctf.com:10663!