* Changed how lighting is calculated
* Changed functions in Shape and its derived classes to conform to new lighting calculations
Merge branch 'StarFaux/Lighting-framework'
shading fix
merge collision
merge collisions again, with fixes!