prepull commit
Merge branch 'master' of github.com:daluce/cs181
problems 1-3 done, 3b could use some attention