week 1

week 1
Merge pull request #1 from stephiee/swagner_dev

week 1