Merge pull request #4 from jennilueck/master

Tweak cube colors
Fix lighting of rotated cubes

Forgot to rotate normals along with positions :(
Merge pull request #1 from rthome/master

Pull changes from upstream