Finalize logistics for turnin
Merge branch 'master' of https://github.com/pjwilcox/cs160-winter13-A2