Initial upload for pull request
Merge pull request #430 from NMarrero/master

Pull request for Serenity RPG