differnt ui still not working
GUI
Delete code.cpp
Delete code.h
Delete code.ui
basic entities
Merge remote-tracking branch 'upstream/master'

Conflicts:
	circle.cpp
	circle.h
	ellipse.cpp
	ellipse.h
	gdcad.pro
	line.cpp
	mainwindow.cpp
	mainwindow.h
	mainwindow.ui