edited lighting and texture calculations
Changed tex and light calcs
Merge branch 'master' of https://github.com/dam1662/cs1566-project