dice test
Merge origin/master
new class