Merge commit '235bb71722f2c07b470d19afca14d74aef15e821' into dice_operations
Merge branch 'dice_operations' of https://github.com/Databean/warsofcatan into dice_operations