Merge pull request #11 from PCCMathProgramReview2014/alex-work

did a little editing - don't want to have to do a complicated merge late...
diversity table 2012-2013 (for the appendix)
updated useful git (reset uncommitted changes details)
updated useful git (reset uncommitted changes details)
updated useful git with reset information
Merge branch 'chris-work' of github.com:PCCMathProgramReview2014/PCCMathProgramReview2014 into chris-work
updated useful git: non-fast forward updates were rejected
Merge pull request #14 from PCCMathProgramReview2014/chris-work

Chris work