first
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.gitignore
Surrender Button visible from Turn 1
gitignore