Merging conflict
Merge branch 'master' of https://github.com/yubowenok/LineArrangement

Conflicts:
	layout.js