no need for it
Not needed
esarfe
Merge branch 'master' of https://github.com/Belbertn/ZeldaJam

Conflicts:
	ZeldaGame/Assembly-UnityScript-firstpass-vs.unityproj
	ZeldaGame/Assembly-UnityScript-firstpass.unityproj
	ZeldaGame/Assets/DamageandHealth.unity
	ZeldaGame/Assets/Standard Assets/Tessellation Shaders/_Example/Materials/lambert1.mat