exit game option
Merge remote branch 'origin/master'

Conflicts:
	Feudal.xcodeproj/project.pbxproj