Merge origin/master

final week
Trying to get the gameplay text area to show messages from Scoreboard class calculateWinnerScore(int win).