Did a bunch of shiz with adding deck reshuffling and formatting things
Merge branch 'master' of https://github.com/dogbyday/SET

Conflicts:
	Player.py