vx
Merge branch 'master' of https://github.com/Helgemonster/CritterSpin

Conflicts:
	Library/shadercompiler-1.log