commit before merge
Merge https://github.com/yaolun/Her_line_fit

Conflicts:
	fit_line.pro
updated