Merge pull request #54 from nolanfilter/Nolan

Updated player model