this and that
merging
Merge pull request #150 from PCCMathProgramReview2014/chris-work

removed a strange floating a