change condition to end game
Merge remote-tracking branch 'origin/master'
change condition to end game
Merge remote-tracking branch 'origin/master'