weird merge issues fixed

TODO.txt

@@ -0,0 +1,12 @@
+Item identifications
+- Base max/min, rounding correctly, and handling pre-ID
+
+Damage calculation
+- General calculation framework
+- Weapon powdering
+- Spell multipler
+- Melee dps and multiplier
+- Poison calculations
+
+Skillpoint engine
+- Make it work...

build.js

@@ -1,4 +1,3 @@
-
 /*Class that represents a wynn player's build.
 */
 class Build{

index.html

@@ -143,6 +143,7 @@
                 <input type="text" id="agi-skp" name="agi-skp" />
             </div>
         </div>
+<<<<<<< HEAD
         <div class = "build">
             <div class = "center" id = "build-helmet" style = "grid-column:1;grid-row:1">
             </div>
@@ -165,6 +166,8 @@
             <div class = "center" id = "build-cumulative-stats" style = "grid-column:2;grid-row:3">
             </div>
         </div>
+=======
+>>>>>>> 87b6212eab1673b1a66ca9849232963f2e57363f
         <script type="text/javascript" src="build.js">
         </script>
         <script type="text/javascript" src="test.js">