Merge pull request #2 from PCCMathProgramReview2014/alex-work

Alex playing again