Initial commit
Merge https://github.com/Tehsapper/sixofhearts

Conflicts:
	.gitignore