Changing getColour to requre a ray and w
fixed addModel()
Changed the calculations to be done in computeColour
Merge branch 'master' of github.com:dgoldberg92/tray-racer