Merge pull request #1 from jrtew/master

Pull Test for Ross's Code
Opps commit
Random Events Added
Merge pull request #2 from jhuffman1123/master

Merging after Tuesday Night.