prelim questions complete
Merge branch 'master' of https://github.com/evanrichter/CS359