small fixes to collisions
Merge branch 'master' of https://github.com/bxdpxndx/geometria-computacional

Conflicts:
	lab1/octree.cpp
	lab1/vector3f.cpp
	lab1/vector3f.h