Added a board for the setup screen
Merge remote-tracking branch 'origin/master'

Conflicts:
	Guardians of the Arena/Guardians of the Arena.userprefs