prepull commit
Merge branch 'master' of github.com:daluce/cs181
some work done on 1 last night plus graph for 3a