close #88
Trying to resolve merge conflict
Merge branch '6.MITx' of https://github.com/uid/caesar-web into 6.MITx