Merge pull request #8 from PurpleKangaroo/master

add tag stuff
Merge pull request #9 from PurpleKangaroo/master

expansion 4
card fix
deck builder fix
removed old TODO
Merge pull request #52 from HoltMaki/master

pull