week 8 materials
another example for tonight
Merge conflicts