rafactors and tabifys
Merge remote-tracking branch 'origin/refactor' into nick_working

Conflicts:
	player.py