updating
week5
Charles
shrunk the file sizes
resolved merge conflict that did not exist
Merge pull request #2 from mxcnsunflwr/submit_hw

charles and marcela pulls wk 05