initial commit
update
Merge branch 'master' of github.com:niaeashes/white-dice

Conflicts:
	.gitignore