Added some opposed dice rolls
Merge branch 'master' into reboot
Merged duplicate work