Merge pull request #3 from klemmer/yu_xia

fix laptop section bug
Merge pull request #4 from klemmer/yu_xia

update assignment 1-4 and Laura's studio breif
merged on jan21
Merge branch 'yu_xia' of https://github.com/klemmer/website into yu_xia
Merge branch 'yu_xia' of https://github.com/klemmer/website into yu_xia
Merge branch 'master' of https://github.com/klemmer/website into yu_xia
Merge branch 'yu_xia' of https://github.com/klemmer/website into yu_xia
Merge branch 'yu_xia' of https://github.com/klemmer/website into yu_xia
Merge branch 'yu_xia' of https://github.com/klemmer/website into yu_xia
Merge branch 'yu_xia' of https://github.com/klemmer/website into yu_xia
Merge branch 'yu_xia' of https://github.com/klemmer/website into yu_xia
Merge branch 'yu_xia' of https://github.com/klemmer/website into yu_xia
newest change on jan 28th