Added game logic for winning conditions
Conflict solved