Sound + Enigme 1 opé
Merge branch 'master' of https://github.com/bossdbz/GTH

Conflicts:
	Assets/Script/ArmÃ©nie/world.js
	GTH-csharp.sln
	GTH.sln
	GTH.userprefs
	Library/CurrentLayout.dwlt
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Library/ScriptAssemblies/Assembly-CSharp.dll
	Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Library/ScriptAssemblies/Assembly-UnityScript.dll
	Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Library/assetDatabase3
	Library/expandedItems
	Library/guidmapper
	Library/metadata/0a/0a3999c94d3aca749acc4bc31323dffe
	Library/metadata/0a/0ab79d7f243824f5d9826bd83522c8df
	Library/metadata/22/22e1a02946f154f4c84f86c8b914e34a
	Library/metadata/2a/2a40be3e17064894f85b082beb58a9ba
	Library/metadata/33/33c0f77ed793e014e95473e3309db9f4
	Library/metadata/36/367471c6ffdbfab4d806e7473f13d78c
	Library/metadata/44/44c61440eb778614199e7a0e7309e7df
	Library/metadata/54/541f013369eac364e8c4b1be486d79e4
	Library/metadata/5b/5b3d01f5a219a4142884cd7ce26660fd
	Library/metadata/65/65bc4f4dcfe59434eba3149f23dc92bd
	Library/metadata/66/66233ce2459d0d94dbf12f33116fcd30
	Library/metadata/6a/6a1d22b6e75660d41b0ad4d233e1da49
	Library/metadata/6a/6a3c8fbb457c6064785db4204ca6bf11
	Library/metadata/76/762de287375743144839c61aff27c5ff
	Library/metadata/98/98187620c8e6d394b83459ebbe026a7a
	Library/metadata/9b/9b2fe942111a01748829babcfe5cdf8f
	Library/metadata/9b/9bb94819640965941b3de72f0d52b0c8
	Library/metadata/af/af516c51965990842b4f972b065715b8
	Library/metadata/b1/b138260b4ab0b1341b5a139263f6e848
	Library/metadata/bb/bb2bf0b2bbee5ee4b819d2733962e065
	Library/metadata/bc/bc4cab599be5a02469bb004b35e16700
	Library/metadata/d6/d6c377d220a1cb54b985c6e7a956471f
	Library/metadata/e0/e001f044dada842c5a54acd17cfc6dca
	Library/metadata/e0/e0e18284993ae5147b25979581a9f939
	Library/metadata/e2/e21bdf4c78cc67f4392d0b4a27a36fdf
	Library/metadata/e7/e7ca448cf08dfa94288c862a19e69c6b
	ProjectSettings/Physics2DSettings.asset