Editing laura
Merge pull request #2 from lauralorenz/master

Editing laura