Merge pull request #14 from PCCMathProgramReview2014/chris-work

Chris work
diversity tables, reorganized directories- will finish the rest soon