Moved setup field from setupscreen to player.py for AI
Merge branch 'master' of https://github.com/BungeeBuddies/Stratego-Ascension

Conflicts:
	player.py
Merge branch 'master' of https://github.com/BungeeBuddies/Stratego-Ascension