Added Zijun's stuff
Merge branch 'master' of https://github.com/jxjzhang/CS246