Formatting
Merge branch 'master' of github.com:nslo/raytracer
Merge branch 'master' of github.com:nslo/raytracer
Added virtual functions for frustum intersection
Merge branch 'master' of github.com:nslo/raytracer
Cleaned a bunch of naming etc up