Erro de falta de commit mac mini
Merge branch 'master' of https://github.com/eduardorcosta/Poker

Conflicts:
	PokerMuck-master/PokerMuck/Classes/Forms/FrmMain.cs
	PokerMuck-master/PokerMuck/PokerMuck.csproj
	PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.CardButton.resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.CardListPanel.resourc
es

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.CardMatchSelectDialog
.resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.ControlListContainer.
resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.EntityCardListPanel.r
esources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.ExtendedStatisticsPan
el.resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.FrmFirstExecutionWiza
rd.resources
	PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.FrmMain.resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.HoldemCardDisplayDial
og.resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.HoldemHudWindow.resou
rces
	PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.HudIcon.resources
	PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.HudWindow.resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.PlayerStatisticsDispl
ay.resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.Properties.Resources.
resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.SingleCardSelectDialo
g.resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.StatisticItem.resourc
es

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.StatisticItemListDisp
lay.resources

PokerMuck-master/PokerMuck/obj/x86/Debug/PokerMuck.TableDisplayWindow.re
sources