pset 7 ampl
merged
Merge branch 'master' of https://github.com/jombooth/eo2