minor changes
fixed merge issues
megin
Merge branch 'master' of https://github.com/bjrafeld/RayTracer
minor changes
mergin
Merge branch 'master' of https://github.com/bjrafeld/RayTracer
Added triangle intersection
fixed merge conflicts in parser.cpp
mergin
Merge branch 'master' of https://github.com/bjrafeld/RayTracer
mergin
Merge branch 'master' of https://github.com/bjrafeld/RayTracer
triangle parsing and intersection stuff