2mm1 and mm2 should be about done now
Merge branch 'master' of https://github.com/ottocode/cs355