Fix merge bugs
Shaders via index.html?composer=1
Merge branch 'master' of https://github.com/Adhesion/ld26