Script for doors ok
manip gitignore
Merge branch 'master' of github.com:NicoSab/Oilin

Conflicts:
	Oilin/Assembly-CSharp-vs.csproj
	Oilin/Assembly-CSharp.csproj
	Oilin/Assets/Animator/EnemyAnimatorController.controller
	Oilin/Assets/Animator/PlayerAnimatorController.controller
	Oilin/Assets/Prefabs/Enemy.prefab
	Oilin/Assets/Prefabs/N40.prefab
	Oilin/Assets/Prefabs/Plum.prefab
	Oilin/Assets/Scenes/level1.unity
	Oilin/Assets/Scripts/PlayerScripts/PlayerHealth.cs
	Oilin/Library/CurrentLayout.dwlt
	Oilin/Library/CurrentMaximizeLayout.dwlt
	Oilin/Library/InspectorExpandedItems.asset
	Oilin/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
	Oilin/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb
	Oilin/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll
	Oilin/Library/ScriptAssemblies/Assembly-CSharp-firstpass.dll.mdb
	Oilin/Library/ScriptAssemblies/Assembly-CSharp.dll
	Oilin/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Oilin/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll
	Oilin/Library/ScriptAssemblies/Assembly-UnityScript-Editor.dll.mdb
	Oilin/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll
	Oilin/Library/ScriptAssemblies/Assembly-UnityScript-firstpass.dll.mdb
	Oilin/Library/assetDatabase3
	Oilin/Library/guidmapper
	Oilin/Library/metadata/03/0308586f2ba634956870e618ecaf7c35
	Oilin/Library/metadata/12/1209a090500c9411dbd99e52869f2dd9
	Oilin/Library/metadata/1a/1afb1c805831f42ef930ffc147e764a5
	Oilin/Library/metadata/1e/1e5031d31ff384ed18bd5b2cdf85735b
	Oilin/Library/metadata/23/23008610da82d4f35b28505075d62e15
	Oilin/Library/metadata/43/433f071edf3514fb785e76304efe8408
	Oilin/Library/metadata/59/591585d4adb174195a9dab3771ac1268
	Oilin/Library/metadata/6e/6e1df926eb89248d08458a092b677468
	Oilin/Library/metadata/93/937bfbc137466451a87addab635272b8
	Oilin/Library/metadata/c8/c862447e4270e4361917494e73ec555d
	Oilin/Library/metadata/cc/cc06752456a1244eaaa5e02f58fcf3ca
	Oilin/Library/metadata/cc/ccb523b936a3749aaa0c3eba26026c83
	Oilin/Library/metadata/ec/ec8e1396c7b2b4c59b1caa341a04c0ff
	Oilin/Library/metadata/ed/edb16ae405f5549e9b858d19fe6c6df4
	Oilin/Oilin-csharp.sln
	Oilin/Oilin.sln
	Oilin/Oilin.userprefs