Added questions 2 and 3
Git is telling me I have unmerged files, so I need to recommit even though I committed my final version yesterday... I don't quite get why this is happening but I need to do it to get to assignment3