Sound Player die/Player pop/Eggs :earth_asia:
conflict
Merge branch 'master' of https://github.com/Zappy-Interface/Zappy-Interface

Conflicts:
	Zappy/Library/ScriptAssemblies/Assembly-CSharp.dll
	Zappy/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb
	Zappy/Library/ScriptAssemblies/Assembly-UnityScript.dll
	Zappy/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb
	Zappy/Library/assetDatabase3
	Zappy/Zappy.userprefs