initial commit2
Merge https://github.com/mjothy/Dice-Paper

Conflicts:
	.gitignore