itsmejos/week7 — pull request #1 by josephdougs (2014-11-22 01:16:03+00:00)
Title: Merge ours and then do the official pull request to turn in

Don't forget to put the stuff from answers.txt in the comment