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
Clearing out the doubles
Finished Battle Module, linked to Upgrade screen
Balanced upgrades, started balancing player stats
added stats file to cards folder
reassigned stats for all named cards

plus one new card
upgrade changes, fixed player select bug
named ALL THE CARDS
Merge branch 'master' of https://github.com/jacobnelson/SimpleCombat

Conflicts:
	SimpleCombat/Assembly-CSharp.pidb
	SimpleCombat/Assets/CombatModule/Scripts/GameController.cs
	SimpleCombat/Assets/CombatModule/Scripts/Profile.cs
	SimpleCombat/Assets/CombatModule/Scripts/UpgradeScreen.cs
	SimpleCombat/Assets/CombatModule/cards/Card Stats.xlsx
	SimpleCombat/Assets/CombatModule/cards/Guru.prefab
	SimpleCombat/Assets/CombatModule/cards/Temp1.prefab
	SimpleCombat/Assets/CombatModule/cards/Temp2.prefab
	SimpleCombat/Assets/CombatModule/cards/WaterDude.prefab
	SimpleCombat/Assets/CombatModule/cards/Winner.prefab
	SimpleCombat/Assets/CombatModule/cards/card 08.prefab
	SimpleCombat/Assets/CombatModule/cards/card 09.prefab
	SimpleCombat/Assets/CombatModule/cards/flameman.prefab
	SimpleCombat/Assets/CombatModule/cards/ninja.prefab
	SimpleCombat/Assets/CombatModule/cards/someone.prefab
	SimpleCombat/Assets/CombatModule/cards/speedy.prefab
	SimpleCombat/Assets/CombatModule/cards/standard.prefab
	SimpleCombat/Assets/CombatModule/cards/tank.prefab
	SimpleCombat/Assets/CombatModule/cards/wild fred.prefab
	SimpleCombat/Assets/CombatModule/cards/wimpy.prefab
	SimpleCombat/Library/AssetServerCacheV3
	SimpleCombat/Library/ScriptAssemblies/Assembly-CSharp.dll
	SimpleCombat/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	SimpleCombat/Library/ScriptMapper
	SimpleCombat/Library/assetDatabase3
	SimpleCombat/Library/expandedItems
	SimpleCombat/Library/guidmapper
	SimpleCombat/Library/metadata/08/086f11437b3a0414eaae9ba33303442f
	SimpleCombat/Library/metadata/17/17a910e0242068142a37c739e2bc4180
	SimpleCombat/Library/metadata/27/27845200e6021314cbd116b87e56d905
	SimpleCombat/Library/metadata/37/3777aab1d4adaa746b4f5fc7f72f6915
	SimpleCombat/Library/metadata/51/517fa4c72fa136941aa846ec9b74900a
	SimpleCombat/Library/metadata/52/5225ab0998419744584442e9b08e0030
	SimpleCombat/Library/metadata/58/58a5ba1e90da15b449acc9649e1f1992
	SimpleCombat/Library/metadata/74/749205bdc2f9fb24db636df31f335b77
	SimpleCombat/Library/metadata/7b/7bfa544a2476b0c4a839fc086a9f3fb1
	SimpleCombat/Library/metadata/94/9465b7ecb0d7cd0409a0e4eee98ea90f
	SimpleCombat/Library/metadata/9b/9b7951c1c7c0c3747839ed33d0c3b9f4
	SimpleCombat/Library/metadata/b5/b5c11dd5c2db224449bcb76fc01d467f
	SimpleCombat/Library/metadata/c9/c9bdbd215d367814c975f203dad962f9
	SimpleCombat/Library/metadata/d4/d4fe5e5b0a5fb774bad33a5a380555cb
	SimpleCombat/Library/metadata/d6/d6b6144a9a6c39d49913a0c2bb2030a5
	SimpleCombat/Library/metadata/e5/e5ea47709eac5c64c86e448b7ba01f6e
	SimpleCombat/Library/metadata/f4/f46a6545def27ca4faf384f66ce8f69c
	SimpleCombat/Library/metadata/f8/f81fff6c56f7efa449c9e1299bef5e22
	SimpleCombat/Library/metadata/fd/fdf39b440e7f27242a49acdca1a14728
	SimpleCombat/SimpleCombat.userprefs