after first refactor
Merge branch 'master' of github.com:alanC89/yahtzee