Example - turbulence
Merge branch 'master' of https://github.com/liamviney/Alfrid

Conflicts:
	js/alfrid/GLTool.js
	js/alfrid/SceneRotation.js
Merge branch 'master' of https://github.com/liamviney/Alfrid

Conflicts:
	examples/turbulence/assets/bg.jpg
	examples/turbulence/assets/blackDot.png
	examples/turbulence/assets/shaders/general.frag
	examples/turbulence/assets/shaders/general.vert
	examples/turbulence/css/main.css
	examples/turbulence/index.html
	examples/turbulence/js/SceneTurbulence.js
	examples/turbulence/js/ViewDot.js
	examples/turbulence/js/app.js
	examples/turbulence/js/config.js
	js/alfrid/GLShader.js
	js/alfrid/ViewCopy.js
Example : Turbulence