Merge branch 'master' of http://github.com/Axelrod-Python/Axelrod

Conflicts:
	axelrod/strategies/_strategies.py
	axelrod/strategies/axelrod_second.py
	axelrod/tests/strategies/test_axelrod_second.py

Author: gaffney2010

CHANGES.md

@@ -1,4 +1,14 @@
-# v3.9.0, 2017-10-13
+# v3.10.0, 2017-11-27
+
+One new strategy
+
+- Add the WmAdams strategy:
+  https://github.com/Axelrod-Python/Axelrod/pull/1142
+
+Here are all the commits for this PR:
+https://github.com/Axelrod-Python/Axelrod/compare/v3.10.0...v3.9.0
+
+# v3.9.0, 2017-11-19
 
 New strategies, a minor bug fix and a small documentation improvement.
 

axelrod/strategies/axelrod_second.py

@@ -760,6 +760,10 @@ def strategy(self, opponent: Player) -> Action:
         if turn == 1: return C
 
         number_defects = opponent.defections
+<<<<<<< HEAD
+=======
+        # Size of numerator is smaller than denomator -- How it was in the Fortran.
+>>>>>>> 3ea83307c177a472ddd174295ee32f5ba2ca7ffa
         perc_defects = number_defects / turn
 
         # If overly defect or appears random
@@ -778,7 +782,10 @@ def strategy(self, opponent: Player) -> Action:
         else:
             return C
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 3ea83307c177a472ddd174295ee32f5ba2ca7ffa
 class WmAdams(Player):
     """
     Strategy submitted to Axelrod's second tournament by William Adams (K44R),

axelrod/tests/strategies/test_axelrod_second.py

@@ -586,7 +586,7 @@ def test_strategy(self):
         actions += [(C, C)] * 99
         self.versus_test(changed_man, expected_actions=actions, seed=1)
 
-class Test(TestPlayer):
+class TestGraaskampKatzen(TestPlayer):
     name = "GraaskampKatzen"
     player = axelrod.GraaskampKatzen
     expected_classifier = {

axelrod/version.py

@@ -1 +1 @@
-__version__ = "3.9.0"
+__version__ = "3.10.0"