week 4+5
Merge pull request #6 from stephiee/swagner_dev

week 4+5