merging
Merge branch 'master' of https://github.com/laurabreiman/line-fitter

Conflicts:
	line-fitter.html