Made CardContainerTest.cc better and added placeholder Deck.h
Merge branch 'Game-Logic' of https://github.com/Zpiritual/fluxx into Game-Logic
Fixed .gitignore conflict
Conflicts:
	.gitignore