Merge pull request #113 from PCCMathProgramReview2014/alex-work

Alex work
edited glossary