Merge pull request #2 from mxcnsunflwr/submit_hw

charles and marcela pulls wk 05
Merge pull request #4 from mxcnsunflwr/master

Merge pull request #2 from mxcnsunflwr/submit_hw