Added a dialog box to the play state to indicate who's turn it is.
Fixed the merge conflict.