Now we have code down for two separate shaders. The next step is to
modify the JavaScript to be able to toggle between them.
Merge branch 'master' into gh-pages
Merge with master