shapes are defined clearly

line -> ray
polygon -> polyhedron
resolve conflicts

Conflicts:
	SarkLibrary/shapes.cpp
	SarkLibrary/shapes.h