Includes code for choosing a winner, almost certainly doesn't work yet.
Merge remote-tracking branch 'origin/master'