trying to get the player color names to change
Merge branch 'master' of github.com:Jacob959/risk-ai

Conflicts:
	src/gameinfodockwidget.cpp
Bug fixed with turning in cards.