Finished writing proof of conservative convergence.
Merge branch 'master' of github.com:CamelliaDPG/Camellia