game over son ok
Merge branch 'master' of https://github.com/EPSIProjetWatchIT/Watchit

Conflicts:
	Assets/Scenes/MenuAvecMinion.unity
	Library/CurrentLayout.dwlt
	Library/CurrentMaximizeLayout.dwlt
	Library/InspectorExpandedItems.asset
	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/metadata/71/719298babe64bc34cac736d2a0b9c0fd
	Library/metadata/87/874c2ec7a045b0b43bcaec77acac6687
	Library/metadata/b5/b5b547d6405080c49b72b73f4f97b828