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

Conflicts:
	Project/Assets/Scenes/GrilleMenu.unity
	Project/Assets/Scenes/GrilleMenu.unity.meta
	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/a7/a72e6aa7bd9984c4b8dd91a2b4728b89
	Project/Library/metadata/da/da1011c76f88428458dcdb3f61f7ef2b
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-4fb83305260bfc843a6810c6a519f19b
	Project/Temp/UnityTempFile-7e23b2c12674f4845ab456886ee9fe32
	Project/Temp/UnityTempFile-8b28ddf21304875408e8a3756ec94da2