midterm
Merge pull request #12 from compagnb/laptop

midterm