commit test
Merge remote-tracking branch 'origin/master'

Conflicts:
	player.py
Merge remote-tracking branch 'origin/master'
simple logic
Merge remote-tracking branch 'origin/master'