Add check if game over, complete calculateWin functionality
Merge branch 'develop'