Merge branch 'stable' into unstable

Conflicts:
	RotCube/cube.html
	RotCube/cube.js
had cubes init with shader error, fixed it by moving window.onload
adjusted the camera a bit
just messing around with lighting
waits 300 mls after reseting to turn.
johnson   notes
more johnson notes
tried to make diffuse2 to make shadows.
Merge branch 'unstable' of https://github.com/rebeccamurphy/RubixCube into unstable
specular light wasnt showing up because of the light pos.
added alerts for file errors. changed lighting.
added comments and made sure default cube can be reanimated.
almost ready to submit
finishing up comments and deleting unused variables
Create README.md
merging