Add dorfbot-rpgdice
resolve merge conflict