WOrk on triangle class
More work
Merge
Added forgotten file
Merge
Fixed bug in whitted that made ugly stuff
Merge branch 'triangle' into develop