testing feedback changes
working with fading player color
no message
Merge branch 'shelf' into feature/Feedback
partially fixed color fade
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into feature/Feedback

Conflicts:
	Assets/Materials/HeadFill.mat.meta
	Assets/Partner with Tail.prefab.meta
	Assets/Player with Tail.prefab
	Assets/Player with Tail.prefab.meta
	Assets/Prefabs/Boundary Container.prefab
	Assets/Prefabs/Boundary Container.prefab.meta
	Assets/Prefabs/ColorExplosion 1.prefab
	Assets/Prefabs/Partner with Tail.prefab
	Assets/Prefabs/Partner with Tail.prefab.meta
	Assets/Prefabs/Partner.prefab
	Assets/Prefabs/Player with Tail.prefab
	Assets/Prefabs/Player with Tail.prefab.meta
	Assets/Prefabs/Player.prefab
	Assets/Prefabs/Points/PointsGroup.prefab
	Assets/Scenes/back_and_forth.unity
	Assets/Scenes/prototype.unity
	Assets/Scenes/storyteller.unity
	Assets/Scripts/Feedback.cs
	Assets/Scripts/OffScreenTracking.cs
	Assets/Scripts/PartnerLink.cs
	Assets/Scripts/Points/CastPoints.cs
	Assets/Scripts/Points/PointGroups.cs
	Assets/Scripts/Points/SimplePoint.cs
	Assets/Scripts/TextFading.cs
	ProjectSettings/TagManager.asset
Added fire prefabs
Added beep sound and slow player script
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into feature/Feedback

Conflicts:
	Assets/Prefabs/Partner.prefab
	Assets/Scenes/prototype.unity
Merge branch 'feature/Feedback' into develop
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into develop