Wednesday nights work
Merge branch 'master' of github.com:acheson/cs171pj2

Conflicts:
	site/js/scatter.js