ruler test
Merge draggable ruler

Conflicts:
	index.html