Adding name
Merge remote-tracking branch 'origin/master' into andrew
Merge remote-tracking branch 'origin/master' into andrew

Conflicts:
	myPlayerBrain.py
Fixed merge problem
Bug fixes
Changing back name