Minor changes
Minor changes
Merge branch 'Game-Logic' of https://github.com/Zpiritual/fluxx into Game-Logic
Headers

Added the "include" folder to the project. Added .user to gitignore.
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
CardManager begun
Worked on basic types
CM cont.
Modified CardID and renamed Test
Merge branch 'Game-Logic' of https://github.com/Zpiritual/fluxx into Game-Logic
Adding test for some reason...
Removed Author comments
New branch, private
removed redundant comments
fixed minor spelling errors
Card Test

Made simple test for Card. Needs expanding. Moved all test .cc:s to the
test folder and created a makefile for the tests.
Merge remote-tracking branch 'origin/Johannes-Private' into Game-Logic

Conflicts:
	include/Deck.h
Fixed errors in Deck and made Card more constant
added more stuff to .gitignore