Discard works now.
Merge branch 'master' into HEAD

Conflicts:
	Player.py