Synchronisation of projects
Merge branch 'master' of https://github.com/GlenDC/PsychedelicShaders

Conflicts:
	.gitignore