update assignment04
merge conflic on jan 29th
Merge branch 'master' of github.com:IntroHCI/website
Merge branch 'master' of github.com:IntroHCI/website
update lab logistic according to Stanford's schedule
update assignment04, 05
Resolve merge conflicts