add distance function and other
add distance function and other
Mefore merge
first working version
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/main.js