Problem formulation
Norm equivalence
Merge branch 'master' into Presentation