lab 2 is up
Merge branch 'yu_xia' of github.com:klemmer/website into yu_xia