Everything is fixed. EVERYTHING
Merge remote-tracking branch 'origin/master'

Conflicts:
	CardGame/CardGame/PlayerControl.xaml.cs
Merge branch 'master' of https://github.com/ScottFries/Card-Game

Conflicts:
	CardGame/CardGame/PlayerControl.xaml.cs