Define additional shader uniforms.
Merge branch 'master' of github.com:zacharydenton/mandelbro

Conflicts:
	outline.md