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
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop
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
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop
Added sprouting when new fluff is spawned, and the players can now be slowed when pushing a block with the bond.
More work on Cradle 2
Added slight rotation to fluffs while moving.
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into develop

Conflicts:
	Assets/Scenes/Cradle 2.unity
	Assets/Scripts/PushPad.cs
Merge branch 'develop' of https://github.com/setrapp/Bond-O-Friendship_Production into feature/merge

Conflicts:
	Assets/Scenes/Cradle 2.unity
	Assets/Scripts/PushPad.cs