colors, improved curve generator.
Merge branch 'master' of https://github.com/hyliandanny/molyjam2013

Conflicts:
	Unity/Assets/Substances.meta
	Unity/Assets/Substances/1715_green_stripes.jpg.meta
	Unity/Assets/Substances/ColorMix.cs.meta
	Unity/Assets/Substances/ColorMixer.shader.meta
	Unity/Assets/Substances/Zebras_wallpapers_209.jpg.meta
	Unity/Assets/Substances/large-black-and-white-stripes-a4.jpg.meta