tetst
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
GUI des stats
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	Project/Assets/Textures/Ground.mat
	Project/Assets/Textures/Mountains.mat
	Project/Assets/Textures/Mud.mat
	Project/Assets/Textures/Spikes.mat
	Project/Library/CurrentLayout.dwlt
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/expandedItems
	Project/Library/guidmapper
	Project/Library/metadata/0b/0b7c4bddc371f1947b2ccc0e546452fd
	Project/Library/metadata/24/240fd7f2495432a4087083c233662999
	Project/Library/metadata/5c/5c96f0149531ce547bd4ca3da6417363
	Project/Library/metadata/68/68e60706914bad94faeae833466e8fe9
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Library/metadata/a4/a479e7507379faf40b7e099c2d6c9ba4
	Project/Library/metadata/a7/a72e6aa7bd9984c4b8dd91a2b4728b89
	Project/Library/metadata/d3/d337d0e42f11ac54696cb8a9b1cd91df
	Project/Library/metadata/ec/ec26ab1edd752554e8406d62c4ad23ce
	Project/Library/metadata/ec/ecd2a075042939c44a679514b2108ea3
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-17df2a66c26ef89489cdcf75cfc5f495
	Project/Temp/UnityTempFile-20c9d5000f3e9074098d3132aa478aea
	Project/Temp/UnityTempFile-24b5e2d08bad5d749bc9a5b3964519d5
	Project/Temp/UnityTempFile-2bffc9bf1bce8744783fbb40ccfaff61
	Project/Temp/UnityTempFile-53421a762798d1a4c9b0bc0c9192b1c4
	Project/Temp/UnityTempFile-5a913b1c3db4d8348acc7e45ce89c30c
	Project/Temp/UnityTempFile-721b98adb8729f2429a0b7280c18bdec
	Project/Temp/UnityTempFile-8194deec83d7f914fa0f32327ee0a617
	Project/Temp/UnityTempFile-a2dd7a3225039e840a0eb7f7535ffa38
	Project/Temp/__EditModeScene