bunch of changes i made yesterday but forgot to commit
Merge branch 'master' of github.com:acheson/cs171pj2
updated scatter