merging in updated master
green dice working
fixed conflicts from dice-roll