Answers
commit merge conflict resolve
 did the first two parts of lecture 2