work
moved folder
Merge remote-tracking branch 'upstream/master'
Merge pull request #11 from ada-linda/master

move folder
Week 2!
Merge remote-tracking branch 'upstream/master'