2. Conflict edit on the host.
Merge branch 'master' of https://github.com/tengjiao/ps00

Conflicts:
	lab00/lab00.txt