2
Merge branch 'master' of github.com:SergeyLp/GraphWidget

Conflicts:
	GraphWidget.h