Did some shit
Merge https://github.com/dogbyday/SET

Conflicts:
	Player.py
Merge https://github.com/dogbyday/SET