Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into feature/xbox_controller_hookup
Hooked up controller. Able to follow a cursor instead of the mouse. TODO: Controller Vibration
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into feature/xbox_controller_hookup

Conflicts:
	Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
Hooked up XInput. Working on vibration settings.
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into feature/xbox_controller_hookup

Conflicts:
	Assets/UnityVS/Editor/UnityVS.VersionSpecific.dll
Created ConversationManager to handle conversations along with PartnerLinks.
Controller vibration works. Partially set up in "partner with controller" scene
Merge branch 'feature/xbox_controller_hookup' into develop
Fixed Waypoints!!!!!!
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into develop

Conflicts:
	Assets/Scenes/partner.unity
Merge branch 'feature/full_converstation' into develop

Conflicts:
	Assets/Prefabs/Partner.prefab
	Assets/Scenes/partner.unity
	Assets/Scripts/WaveSeek.cs
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into develop
Merge branch 'develop' of https://github.com/setrapp/Conversation_Drawer-Production into develop
Combined mouse and cursor seek into one script.