Final project draft
Merge pull request #143 from lauralorenz/master

Final project draft