Merge pull request cgpotts#39 from insop/insop/resolve_conflict

Resolve conflict from previous merge

hw_wordsim.ipynb

@@ -1073,12 +1073,7 @@
     "\n",
     "People who enter will receive the additional homework point, and people whose systems achieve the top score will receive an additional 0.5 points. We will test the top-performing systems ourselves, and only systems for which we can reproduce the reported results will win the extra 0.5 points.\n",
     "\n",
-<<<<<<< HEAD
     "Late entries will be accepted, but they cannot earn the extra 0.5 points. Similarly, you cannot win the bake-off unless your homework is submitted on time.\n",
-=======
-    "Late entries will be accepted, but they cannot earn the extra 0.5 points. Similarly, you \n",
-    "cannot win the bake-off unless your homework is submitted on time.\n",
->>>>>>> origin/master
     "\n",
     "The announcement will include the details on where to submit your entry."
    ]

np_sgd_classifier.py

@@ -79,16 +79,9 @@ def fit(self, feat_matrix, labels):
                     self.coef_[label_index] += self.eta * rep
 
     def predict_one(self, rep, costs=0.0):
-<<<<<<< HEAD
         """The core classification function. The code just needs to
         figure out which class is highest scoring and make a random
         choice from that set (in case of ties).
-=======
-        """The core classification function. After using
-        `predict_one`, the code just needs to figure out which
-        class is highest scoring and make a random choice from that
-        set (in case of ties).
->>>>>>> origin/master
 
         Parameters
         ----------