Merge
Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

Conflicts:
	Library/guidmapper
Affichage Score sur Game Over
Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

Conflicts:
	Assets/Scenes/Scene_Chateau.unity.meta
	Library/CurrentLayout.dwlt
	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/07/0771f695613a392409570c3e6149c3d5
	Library/metadata/13/13cfdd77dd4c1634c95b73211be8f1fe
	Library/metadata/1b/1bc59e55ce32adb48bee14c092ad1572
	Library/metadata/20/2019ee91c6c25d54da00e3d93fba0cc6
	Library/metadata/26/26ab4e06108b21f47b93e2affcc8fa0d
	Library/metadata/40/40834fdddea914b42830ea96f59c6b21
	Library/metadata/46/4650b64435916dd4891cda039c5ea44d
	Library/metadata/48/48db2b8fc426879428627fe1f11b449a
	Library/metadata/49/495f6eb8be10d7442bde94ee06b6b138
	Library/metadata/51/510a65b33d3c8a547b5eee2470646fd2
	Library/metadata/52/52a4c7efdd9d3604abdad1a81fa6e35e
	Library/metadata/53/53247f3e1b9f2f44cadcbcfba72a2c41
	Library/metadata/5e/5e24355849ffb1445a1ffbe3e741a213
	Library/metadata/5f/5f02dd169444d4b4bb641801f416eebc
	Library/metadata/69/69197d347b0af3d418fa323de7625105
	Library/metadata/6e/6edfb4d0899b34c48b30464d6ea3d0b1
	Library/metadata/71/7135f0385cb30b643962ffb08b0feb55
	Library/metadata/71/719298babe64bc34cac736d2a0b9c0fd
	Library/metadata/75/75925d2c539c2c34f81f56b238bcaf1b
	Library/metadata/76/76e3381e6a2b03f4494845d03586ce9c
	Library/metadata/82/82c11317b645cdf4993244fffc5c1a55
	Library/metadata/88/88da34c0d3d37de4dbac7a7ac130b511
	Library/metadata/89/8904c8bb9bc178c4b8ac9d277e547ee5
	Library/metadata/8f/8f0aa2397b67c0348a546fa5139ec16d
	Library/metadata/96/96d7bfa19254ae54684ce9d8dcf1280b
	Library/metadata/a9/a9a18e8c5da9c71468368e0147bffd87
	Library/metadata/ad/ad752feb093ab104ea5de217604e8ce7
	Library/metadata/b6/b678be60619afbf4993e0a7123dca58b
	Library/metadata/c0/c0839b5f95928e24fb0679ebf4731af0
	Library/metadata/c1/c1ee42673cde84c439ad31de4bebb28a
	Library/metadata/c2/c28dde3149f105842a035c5240fd1441
	Library/metadata/d3/d3cf46a2157a3cf47bb8b2dec38c5437
	Library/metadata/d7/d77a1f74c807e1944ae1504db92abfb6
	Library/metadata/db/db17fa7691fbd7b488c92bbdb6a13997
	Library/metadata/e1/e16e0e380b552014f8f86bb1cced60b4
	Library/metadata/e6/e6254020218e1de47a079a9205b81434
	Library/metadata/e8/e84b6c92d88890d4c8c47095a5c69c21
	Library/metadata/eb/ebc8a25f3546f6240aeadda693c8dfc4
	Library/metadata/ec/ec1de1260a6372242bdcdcd24f7f6d5e
	Library/metadata/ee/ee768b292f35abc409f7a5b75d3830af
	Library/metadata/f8/f898cb0df4cdd8d40adbaac6d178b038