activity two commit

edited according to the activity two of magpie lab
Merge branch 'master' of https://github.com/acheng17/Magpie