Presentation
Merge branch 'profiler' of github.com:nslo/raytracer into profiler
Merge branch 'profiler' of github.com:nslo/raytracer into profiler

Conflicts:
	presentation/presentation.odp