Merge branch 'master' of https://github.com/Antobiotics/JUCE_GLSL_EXPERIMENTS

Conflicts:
	JUCE
Merge branch 'master' of https://github.com/Antobiotics/JUCE_GLSL_EXPERIMENTS

Conflicts:
	README.md