hh
Merge branch 'master' of https://github.com/jak-open/dice

Conflicts:
.gitignore
fd