update assignment 1-4 contents
lab 2 v1
Merge branch 'master' of https://github.com/IntroHCI/website
Merge branch 'master' of https://github.com/IntroHCI/website
removed duplicate line.
Merge branch 'master' into yu_xia_dev

Conflicts:
	assignments/assignment02.html