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' 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
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments
Added slight rotation to fluffs while moving.
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/generative_experiments