rebase conflict resolution
rebase conflict resolution

Signed-off-by: Marc Harper <986e34797d72e12895583f2a2ffc4b698fda379b@gmail.com>

marcharper/Axelrod,ranjinidas/Axelrod,ranjinidas/Axelrod,marcharper/Axelrod