week3 materials
Finishing up the merge