fixed normals
Merge branch 'ship-lighting-ambient'
Merge branch 'master' of github.com:akajla09/cs174a-project