PokerButt -> PokerMain
Merge branch 'master' of github.com:Brunope/JavaPokerEngine
Merge branch 'master' of github.com:Brunope/JavaPokerEngine
fix merge
formatting