adding webgl stuff
fixing merge conflicts