Merge pull request #2 from mxcnsunflwr/submit_hw

charles and marcela pulls wk 05