Somehow Geometry.h disappeared while merging. Remade it from scratch. If
you find anything I else broke while merging please tell me so I can fix
it.