Update for merge

- Added to Categories
- Removed comment
- Rebuilt pages

src/js/config/Categories.js

@@ -77,6 +77,7 @@ var Categories = [
             "RC4",
             "RC4 Drop",
             "ROT13",
+            "ROT47",
             "XOR",
             "XOR Brute Force",
             "Derive PBKDF2 key",

src/js/operations/Rotate.js

@@ -151,7 +151,7 @@ var Rotate = {
 
             for (var i = 0; i < input.length; i++) {
                 chr = input[i];
-                if (chr >= 33 && chr <= 126) { // Upper case
+                if (chr >= 33 && chr <= 126) {
                     chr = (chr - 33 + amount) % 94;
                     output[i] = chr + 33;
                 }

src/static/stats.txt

@@ -1,35 +1,20 @@
-<<<<<<< HEAD
 202	source files
-104241	lines
+104269	lines
 	size
 
 136	JavaScript source files
-95169	lines
+95179	lines
 3.5M	size
-=======
-203	source files
-104218	lines
-4.0M	size
-
-136	JavaScript source files
-95128	lines
-3.4M	size
->>>>>>> master
 
 78	third party JavaScript source files
 76377	lines
 2.8M	size
 
 58	first party JavaScript source files
-<<<<<<< HEAD
-18792	lines
+18802	lines
 736K	size
-=======
-18751	lines
-724K	size
->>>>>>> master
 
-3.2M	uncompressed JavaScript size
+3.1M	uncompressed JavaScript size
 1.7M	compressed JavaScript size
 
 15	categories