Player 17 Warchol&Donovan
Merge remote-tracking branch 'origin/master'

Conflicts:
	prisoners_dilemma.py