Changes for merge

- Removed conflicting build files
- Moved @author tags

src/js/operations/Cipher.js

@@ -3,7 +3,7 @@
 /**
  * Cipher operations.
  *
- * @author n1474335 [n1474335@gmail.com] & Matt C [matt@artemisbot.pw]
+ * @author n1474335 [n1474335@gmail.com]
  * @copyright Crown Copyright 2016
  * @license Apache-2.0
  *
@@ -395,6 +395,7 @@ var Cipher = {
     /**
      * Vigenere cipher encode.
      *
+     * @author Matt C [matt@artemisbot.pw]
      * @param {string} input
      * @param {Object[]} args
      * @returns {string}
@@ -442,6 +443,7 @@ var Cipher = {
     /**
      * Vigenere cipher decode.
      *
+     * @author Matt C [matt@artemisbot.pw]
      * @param {string} input
      * @param {Object[]} args
      * @returns {string}

src/static/stats.txt

@@ -1,35 +0,0 @@
-203	source files
-<<<<<<< HEAD
-104345	lines
-	size
-
-136	JavaScript source files
-95255	lines
-3.5M	size
-=======
-104221	lines
-4.0M	size
-
-136	JavaScript source files
-95131	lines
-3.4M	size
->>>>>>> master
-
-78	third party JavaScript source files
-76377	lines
-2.8M	size
-
-58	first party JavaScript source files
-<<<<<<< HEAD
-18878	lines
-740K	size
-=======
-18754	lines
-724K	size
->>>>>>> master
-
-3.2M	uncompressed JavaScript size
-1.7M	compressed JavaScript size
-
-15	categories
-154	operations