Merge commit '8b0e2b2' into block_dice
Merge commit '2dc588d' into block_dice
Merge commit '79ba973' into block_dice

Conflicts:
	src/main.cpp
	src/main.h
Merge commit 'f5c94e8' into block_dice

Conflicts:
	src/main.cpp
Merge commit 'c791218' into block_dice

Conflicts:
	src/main.cpp