Version 0.0.1
Merge branch 'master' of https://github.com/ali-bahjati/Peris

Conflicts:
	drawingarea.cpp
	drawingarea.h
	drawingform.cpp
	drawingform.h
	drawingform.ui
	linepoints.cpp
	linepoints.h
	main.cpp
	scale.cpp
	scale.h

Version 0.0.1
Version 0.0.1