Merge pull request #18 from timothy-king/master
authorTim King <taking@cs.nyu.edu>
Sat, 8 Mar 2014 19:44:56 +0000 (14:44 -0500)
committerTim King <taking@cs.nyu.edu>
Sat, 8 Mar 2014 19:44:56 +0000 (14:44 -0500)
Merging in the glpk changes


Trivial merge