J'ai dormi
a
Merge branch 'master' of https://github.com/tommylavoie/WonderJamA2014

Conflicts:
	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/10/10746f195b9ef5b4c83fe251c0a4c41d
	Project/Library/metadata/25/250d198e342be4e4896da59075b0bc03
	Project/Library/metadata/26/2651b3152410a9946b7a8880b90db947
	Project/Library/metadata/3e/3e31649f2e2fe5d45a673bc7e53f2412
	Project/Library/metadata/53/532412f90f494ac46a6e9ca2d14bfc10
	Project/Library/metadata/5c/5c2891592c65f054981cb12d05181901
	Project/Library/metadata/98/981858d3c5bdae446b7a882f58c32be1
	Project/Library/metadata/9c/9c3e61ff95811724b8e3c846eaade57c
	Project/Library/metadata/f5/f5a16530ae261f54791a220d5182ea17
	Project/Library/metadata/f7/f7d99b2942fcb5a48a15d2bbb136950d
	Project/Project-csharp.sln
	Project/Project.sln
	Project/Temp/UnityTempFile-5043f3f7dac291e4a80236221287824c