merge on feb 13
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
fix typo and update assignment on feb 15th