Not sure
Merge https://github.com/dogbyday/SET

Conflicts:
	Game.py