dot cross done
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
dot cross done
Merge branch 'master' of https://github.com/komgraf/line-And-Point

Conflicts:
	index.html