added blur shader
merge conflicts resolved