In week 3
merge conflict fixed.
hw 3 1 complete.
week 3 complete