#cartemagique
Merge remote-tracking branch 'origin/master'

Conflicts:
	Wars Of Baraxa/Assembly-UnityScript-vs.unityproj
	Wars Of Baraxa/Assembly-UnityScript.unityproj
	Wars Of Baraxa/Assets/Graphics/Prefab/card_Front.prefab
	Wars Of Baraxa/Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
	Wars Of Baraxa/Library/AssetServerCacheV3
	Wars Of Baraxa/Library/CurrentLayout.dwlt
	Wars Of Baraxa/Library/InspectorExpandedItems.asset
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-CSharp.dll
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Wars Of Baraxa/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Wars Of Baraxa/Library/assetDatabase3
	Wars Of Baraxa/Library/expandedItems
	Wars Of Baraxa/Library/guidmapper
	Wars Of Baraxa/Library/metadata/05/05efb0cab839e1b46ba8e11b6be9a5c7
	Wars Of Baraxa/Library/metadata/1f/1f305b2335daeba499eecf86b09670fd
	Wars Of Baraxa/Library/metadata/41/41c92b3c77fef364a956e57a58dca1fb
	Wars Of Baraxa/Library/metadata/be/be8a98a0d69d2e5498a051a7a29655dc
	Wars Of Baraxa/Library/metadata/c3/c32a1035975b46a49936f13ea93eddb3
	Wars Of Baraxa/Library/metadata/d7/d77a6acb95aa5df48aed610693774499
	Wars Of Baraxa/Library/metadata/e7/e739df3c4d610274099492ea54f9fcb3
	Wars Of Baraxa/Library/metadata/ef/ef8006a13aa46924292fbc83bffa801a
	Wars Of Baraxa/Library/metadata/f6/f6b44945ca2249340b195e49aa40f745
	Wars Of Baraxa/ProjectSettings/TagManager.asset
	Wars Of Baraxa/Wars Of Baraxa.userprefs