remove vagrant and git conflict slides from lab1, created lab2 prep page
Merge branch 'yu_xia' of github.com:klemmer/website into yu_xia