Add game winner logic
Fix winner logic
Merged