Finished first draft of max margin formulation
Fixed merge conflicts; added \mmql{} variable
Fixed merge conflicts