.
Merge branch 'in-progress' of https://github.com/tamwahba/pyNoThanks into in-progress

Conflicts:
	player.py