removed 3.2
Merge branch 'import' of github.com:Cal-CS-61A-Staff/ok into import