github

github probleme obliger de commit
Merge
Merge remote-tracking branch 'remotes/origin/master' into Marc

Conflicts:
	ProjectTraining2&3/Assembly-CSharp-vs.csproj
	ProjectTraining2&3/Assembly-CSharp.csproj
	ProjectTraining2&3/Assets/GUISkin/Skin.guiskin
	ProjectTraining2&3/Assets/Prefabs/Ennemy.prefab
	ProjectTraining2&3/Assets/Scenes/Stage1.unity
	ProjectTraining2&3/Assets/Scripts/SwordAttack.cs
	ProjectTraining2&3/Library/CurrentLayout.dwlt
	ProjectTraining2&3/Library/CurrentMaximizeLayout.dwlt
	ProjectTraining2&3/Library/InspectorExpandedItems.asset
	ProjectTraining2&3/Library/ScriptAssemblies/Assembly-CSharp.dll
	ProjectTraining2&3/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	ProjectTraining2&3/Library/assetDatabase3
	ProjectTraining2&3/Library/expandedItems
	ProjectTraining2&3/Library/guidmapper
	ProjectTraining2&3/Library/metadata/00/00000000000000005100000000000000
	ProjectTraining2&3/Library/metadata/00/0000000000000000b000000000000000
	ProjectTraining2&3/Library/metadata/04/0425bd3923d20264bb30c9ccda1b124a
	ProjectTraining2&3/Library/metadata/05/05308e0535b81214fa0add2c5239784a
	ProjectTraining2&3/Library/metadata/0a/0a80cc7b36c0ffb4bb0a4a9ca1690d10
	ProjectTraining2&3/Library/metadata/0b/0b5e6725d9cebe34bb07a8781e121da4
	ProjectTraining2&3/Library/metadata/0c/0c7d36026221350478fe429ef585a08c
	ProjectTraining2&3/Library/metadata/10/10e85ab918d31e748962713d59f1b0e5
	ProjectTraining2&3/Library/metadata/11/11bc2e214c6f90b46b10e92a35cb09e7
	ProjectTraining2&3/Library/metadata/12/127a5c6778f029d469ab70279619efd5
	ProjectTraining2&3/Library/metadata/15/15afb33d128be214fab8dced6d0e44ed
	ProjectTraining2&3/Library/metadata/17/17e3432b8d335054dbb3477db8045602
	ProjectTraining2&3/Library/metadata/1a/1a0182a50839ca442aa13e8a1a551690
	ProjectTraining2&3/Library/metadata/1a/1ac8e34775430154485eaacceced2ff9
	ProjectTraining2&3/Library/metadata/1c/1ce013b7f73fce14db0e3d604a9fcc9c
	ProjectTraining2&3/Library/metadata/1e/1e1e43ce8ad71084fa6927e373744e07
	ProjectTraining2&3/Library/metadata/24/244a7a2413568d94194cd537e3b70bf0
	ProjectTraining2&3/Library/metadata/27/2750eae57c0debd4cae877ac1f2fdc42
	ProjectTraining2&3/Library/metadata/29/29a95c0913d4ca54290f7c3c7ef73a1c
	ProjectTraining2&3/Library/metadata/29/29b47f6384331d74d822df0db11091d0
	ProjectTraining2&3/Library/metadata/3e/3e515486d8a99574ab9adedb25dd87f2
	ProjectTraining2&3/Library/metadata/41/41fe894e8c756a948849a32f8b6e8cda
	ProjectTraining2&3/Library/metadata/44/44f451cdc2916d74caeea5cc84b71dc9
	ProjectTraining2&3/Library/metadata/47/4708a346c4b37534c9bfdb75fb04b6f9
	ProjectTraining2&3/Library/metadata/47/47ec26758c14c0d43994e15c34a6a7dc
	ProjectTraining2&3/Library/metadata/4a/4ab3795af44805c43a1f2b5c36cd348d
	ProjectTraining2&3/Library/metadata/4c/4cc654b8e489ec246b57cbf49d4b5ee5
	ProjectTraining2&3/Library/metadata/56/5644e38af347e4447a6b88cba5a8bbbd
	ProjectTraining2&3/Library/metadata/5c/5c3a9e31e3e63934fb2bdc839cb514aa
	ProjectTraining2&3/Library/metadata/6e/6ec67d488762de445bf84f672ac71848
	ProjectTraining2&3/Library/metadata/7e/7e18af5eeef0bb443a6b38700f9b07dc
	ProjectTraining2&3/Library/metadata/81/816ac9d95c971c34384aa453b36dea10
	ProjectTraining2&3/Library/metadata/87/87353645283bfcf419f3638153ab4472
	ProjectTraining2&3/Library/metadata/8a/8abda17b0334619488cdecb22f804da4
	ProjectTraining2&3/Library/metadata/90/90c96f1357f0fc34fb5122be5ed275b0
	ProjectTraining2&3/Library/metadata/94/9480e23c63629dc41b946f5164c3956b
	ProjectTraining2&3/Library/metadata/94/9489dd9bcce69ea429aeccef8a5f2d63
	ProjectTraining2&3/Library/metadata/9c/9ceb49165343f5a4ca4a768eadfb90f5
	ProjectTraining2&3/Library/metadata/9d/9d19626ca0af80f42871809db40985dc
	ProjectTraining2&3/Library/metadata/a1/a18b47d7ff3a8d2488f8161d5a951eb5
	ProjectTraining2&3/Library/metadata/a1/a196b166c8e08d341ac48a824b9f3799
	ProjectTraining2&3/Library/metadata/a5/a54e50fdf9a1e9c4e9a3052acaa103ca
	ProjectTraining2&3/Library/metadata/ab/ab6cf38caad3582469101a17d0c3499a
	ProjectTraining2&3/Library/metadata/b0/b0d378e68a144d84481e16d0df7950ba
	ProjectTraining2&3/Library/metadata/b1/b1596c2d8c8d3ed49a008d0b69f2b5b2
	ProjectTraining2&3/Library/metadata/b6/b6b543e9b9c761345ae958d1393224b7
	ProjectTraining2&3/Library/metadata/b9/b90a719f05add83439c6fbaa587f10c4
	ProjectTraining2&3/Library/metadata/bb/bb81216eaf9f01e469efce61b5de395c
	ProjectTraining2&3/Library/metadata/c0/c0d2a03a44f518c4e98949c252f00faf
	ProjectTraining2&3/Library/metadata/c3/c3bdb9f88ff8a8c4f8baeb0ecc0d181c
	ProjectTraining2&3/Library/metadata/c4/c4cab2b7401bed84599082d36548e662
	ProjectTraining2&3/Library/metadata/cd/cdd602349dfdf6e478268cd378c14dcb
	ProjectTraining2&3/Library/metadata/ce/ce8306cbd81070347b85506359c99d64
	ProjectTraining2&3/Library/metadata/d1/d1bcbcda8d1869b488a1671e8aff21a2
	ProjectTraining2&3/Library/metadata/e1/e1dda79acc4adf74ba8ea73ae2a83242
	ProjectTraining2&3/Library/metadata/e4/e4f9d6bee63fa36438949455901b74cb
	ProjectTraining2&3/Library/metadata/e6/e645fbb3768b6c54a80e8bc489c08c2e
	ProjectTraining2&3/Library/metadata/e8/e86dde7ac6e8ac042abf13e494b24420
	ProjectTraining2&3/Library/metadata/e9/e98a705ac3e00aa43978e1448b4fc58b
	ProjectTraining2&3/Library/metadata/ee/eee21632161640d4ea4bb0176a733321
	ProjectTraining2&3/Library/metadata/ef/ef7287d22cbdb774b93f3c02ce28991c
	ProjectTraining2&3/Library/metadata/f2/f205edf0f95e766429c734adf14ca2ad
	ProjectTraining2&3/Library/metadata/f3/f3687f4ae60362c489e9679b1b1b2c8f
	ProjectTraining2&3/Library/metadata/fa/faf50225157bf684da4f41dc6aeb2eeb
	ProjectTraining2&3/Library/metadata/fb/fb19057123f70d447b86dae895a11123
	ProjectTraining2&3/Library/metadata/ff/ffbf466afa5adb743b4a3ddb552cf185
	ProjectTraining2&3/ProjectSettings/Physics2DSettings.asset
	ProjectTraining2&3/ProjectSettings/TagManager.asset
	ProjectTraining2&3/ProjectTraining2&3-csharp.sln
	ProjectTraining2&3/ProjectTraining2&3.sln
	ProjectTraining2&3/ProjectTraining2&3.userprefs