part 2 of warmup
Merge branch 'master' of github.com:rchen152/CS181

getting warmup stuff
warmup part 2 done
warmup part 2