Merge branch 'master' of https://github.com/bkimminich/kata-tcg

Conflicts:
	README.md
Merge branch 'master' of https://github.com/bkimminich/kata-tcg