Reworked card information
some other stuff??
Merge branch 'master' of https://github.com/jacobnelson/SimpleCombat

Conflicts:
	SimpleCombat/Assembly-CSharp.pidb
	SimpleCombat/Assets/CombatModule/Scripts/GameController.cs
	SimpleCombat/Library/ScriptAssemblies/Assembly-CSharp.dll
	SimpleCombat/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SimpleCombat/Library/assetDatabase3
	SimpleCombat/Library/metadata/58/58a5ba1e90da15b449acc9649e1f1992
	SimpleCombat/Library/metadata/f8/f81fff6c56f7efa449c9e1299bef5e22
	SimpleCombat/SimpleCombat.userprefs
lets try that again