Magical Happiness.
Merge branch 'master' of https://github.com/hyliandanny/molyjam2013

Conflicts:
	Unity/Assets/Models.meta
	Unity/Assets/Scenes/TrippyGameplay.unity.meta
	Unity/Assets/Texture.meta
Merge branch 'master' of https://github.com/hyliandanny/molyjam2013
Merge branch 'master' of https://github.com/hyliandanny/molyjam2013
Merge branch 'master' of https://github.com/hyliandanny/molyjam2013
Merge branch 'master' of https://github.com/hyliandanny/molyjam2013
getting prepped for dynamic curve generator based on color.
Merge branch 'master' of https://github.com/hyliandanny/molyjam2013
Merge branch 'master' of https://github.com/hyliandanny/molyjam2013
dynamic jump height and pickup size/height based on amazingness!
Merge branch 'master' of https://github.com/hyliandanny/molyjam2013