adding models and highlights and contours hopefully working
Merge branch 'master' of https://github.com/geekrandom/cs348HW4