First pages commit
updated scatterplot2.js
merge fix