paths are generated using d3 the right way
fixed merge conflict in scripts

Merge branch 'messing_with_paths' into paths

Conflicts:
	client_server/public/javascripts/scripts.js