updated readme
copied code from 2d black and white in order to modify to add color
updated shader
displays a shaded square and triangle with a gradient
fixin conflicts
Merge branch 'cubes' into gh-pages
Merge branch 'gh-pages' of https://github.com/NathanSass/webGL into gh-pages