add
Merge branch 'master' of github.com:XFHNever/JobPrepare

Conflicts:
	web/html-css.md
	web/js.md