useless commit - disregard.
solved conflict

Conflicts:
	strategies/chris.py