Created header file, Circle class, Point class
Fixed merge errors