fix conflict on feb 24th
Merge branch 'yu_xia' of https://github.com/klemmer/website into yu_xia
update on feb 25th