package.json diff
Merge branch 'master' of https://github.com/wilwong/csc309-v2
Merge branch 'master' of https://github.com/wilwong/csc309-v2
parlevu schema, thing.js update, and try to create collection