Changed some testing stuff fo sho
Merge branch 'master' of https://github.com/dogbyday/SET

Conflicts:
	Game.py