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