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

Conflicts:
	Project/Assets/Audios.meta
	Project/Assets/Scripts/Personnage.cs
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll
	Project/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Project/Library/assetDatabase3
	Project/Library/guidmapper
	Project/Library/metadata/65/658abec2b47b172438ec44f3c34f0911
	Project/Library/metadata/7d/7de8aa8a06e11784c8d3023dee7cf536
	Project/Library/metadata/a7/a72e6aa7bd9984c4b8dd91a2b4728b89
	Project/Library/metadata/bf/bf193367c23855b48ac30a87f3585831
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-1427000ed80295b4eb2933b320254964
	Project/Temp/UnityTempFile-a0bed2e6ff0aafe41becdba785ceccdd
	Project/Temp/UnityTempFile-b8cab18a01dc7554f85790486bb079dc
	Project/Temp/__EditModeScene