fixed dice or not
Merge branch 'master' of github.com:foresterh/marvin
fixed Greg's commit