Changed primitives to obj
Merge branch 'master' of github.com:simzou/cs143-simpledb