Finished resetting dice roll
Merged Megan's changes into mine