Begin testing winner calculator
Resolve merge conflicts
Merge pull request #44 from nickb1080/master

Build preliminary winner calculator