Modified CardID and renamed Test
Merge branch 'Game-Logic' of https://github.com/Zpiritual/fluxx into Game-Logic