More stuff
Oops pictures
Merge branch 'packet-refactor' of github.com:nslo/raytracer into packet-refactor

Conflicts:
	raytracer/src/raytracer/main.cpp