++
Merge branch 'master' of https://github.com/sol0mka/svg-draw

Conflicts:
	js/modules/line.js