rafactors and tabifys
Merge branch 'master' of github.com:Yacob/barracuda

Conflicts:
	player.py