Merge branch 'master' of C:\Users\Arytmetyk\Dropbox\TCS\IdeaProjects\PokerTCS with conflicts.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
New adapters