Merge branch 'feature/generative_experiments' of https://github.com/arun-abraham/Bond-O-Friendship into feature/generative_experiments
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments
Merge branch 'develop'
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments
Merge branch 'feature/generative_experiments' of https://github.com/arun-abraham/Bond-O-Friendship into feature/generative_experiments
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments
Merge branch 'feature/generative_experiments' of https://github.com/arun-abraham/Bond-O-Friendship into feature/generative_experiments
Merge branch 'feature/generative_experiments' of https://github.com/arun-abraham/Bond-O-Friendship into feature/generative_experiments
updated to unity 5
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments

Conflicts:
	Assets/Scripts/PulseShot.cs
Merge branch 'feature/generative_experiments' of https://github.com/arun-abraham/Bond-O-Friendship into feature/generative_experiments
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments

Conflicts:
	Assets/XInputDotNet/Examples/XInputTestCS.cs
Merge branch 'feature/generative_experiments' of https://github.com/arun-abraham/Bond-O-Friendship into feature/generative_experiments
Rotating to look blown in wind almost works. Constraining within a max rotation is not quite there yet.
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments
Fluffs rotate correctly for a range of angles (most obtuse).
Fluffs in front shake a lot.
Sooooo close.
Starting fluffs popping back to rest position.
Added slight rotation to fluffs while moving.
Reset fluffs to resting orientation when stopped.
Changed player1 stopping threshold in swaying scene.
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments