added win condition
Merge branch 'working'