added Halley's answers
Merge branch 'master' of https://github.com/Grinnell-CSC195/hw2-2014S