Mira's hw
Merge branch 'master' of https://github.com/Grinnell-CSC195/hw3-2014S