You can keep the dice you want by clicking them
Merge remote-tracking branch 'origin/master'

Conflicts:
	AttackOnTokyo/AttackOnTokyo.userprefs