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
Names stuff, fixed start code for cards

The cards were not running the start function so I fixed it
fixed the passStats function, added some names, changed the upgrade page
stuffs and the things
Merge branch 'master' of https://github.com/jacobnelson/SimpleCombat

Conflicts:
	SimpleCombat/Assembly-CSharp.pidb
	SimpleCombat/Assets/CombatModule/Scripts/GameController.cs
	SimpleCombat/Assets/CombatModule/Scripts/UpgradeScreen.cs
	SimpleCombat/Assets/CombatModule/cards/flameman.prefab
	SimpleCombat/Assets/CombatModule/cards/ninja.prefab
	SimpleCombat/Assets/CombatModule/cards/wimpy.prefab
	SimpleCombat/Library/ScriptAssemblies/Assembly-CSharp.dll
	SimpleCombat/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SimpleCombat/Library/assetDatabase3
	SimpleCombat/Library/guidmapper
	SimpleCombat/Library/metadata/08/086f11437b3a0414eaae9ba33303442f
	SimpleCombat/Library/metadata/52/5225ab0998419744584442e9b08e0030
	SimpleCombat/Library/metadata/58/58a5ba1e90da15b449acc9649e1f1992
	SimpleCombat/Library/metadata/7b/7bfa544a2476b0c4a839fc086a9f3fb1
	SimpleCombat/Library/metadata/f8/f81fff6c56f7efa449c9e1299bef5e22
	SimpleCombat/SimpleCombat.userprefs