diff --git a/main.js b/main.js
index 72f0f1a8..16ee97b5 100644
--- a/main.js
+++ b/main.js
@@ -13,11 +13,42 @@ const rl = readline.createInterface({
 
 // the function that will be called by the unit test below
 const rockPaperScissors = (hand1, hand2) => {
-
+    hand1 = hand1.trim().toLowerCase();
+    hand2 = hand2.trim().toLowerCase();
+    
+    if(hand1===hand2){
+        return "It's a tie!";
+    }
+    else if(hand1==="rock"){
+        if(hand2==="scissors"){
+            return "Hand one wins!"
+        }
+        else if(hand2==="paper"){
+            return "Hand two wins!";
+        }
+    }
+    else if(hand1==="paper"){
+        if(hand2==="scissors"){
+            return "Hand two wins!"
+        }
+        else if(hand2==="rock"){
+            return "Hand one wins!";
+        }
+    }
+    else if(hand1==="scissors"){
+        if(hand2==="paper"){
+            return "Hand one wins!"
+        }
+        else if(hand2==="rock"){
+            return "Hand two wins";
+        }
+    }
+    
+}
   // Write code here
   // Use the unit test to see what is expected
 
-}
+
 
 // the first function called in the program to get an input from the user
 // to run the function use the command: node main.js
diff --git a/package.json b/package.json
index 09c5e8f1..eefd2ea0 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
     "eslint": "^3.19.0",
     "functional-javascript-workshop": "^1.0.6",
     "htmllint-cli": "github:kevincolten/htmllint-cli",
-    "http-server": "^0.11.1",
+    "http-server": "^0.12.3",
     "javascripting": "^2.6.1",
     "jsdom": "^11.6.2",
     "mocha": "^5.0.0",