Merge pull request #5 from jychen7/dev

Week3a