Merge branch 'master' of https://github.com/lawrenz1337/webstudy

Conflicts:
	html/html_task2.html
Merge branch 'master' of https://github.com/lawrenz1337/webstudy

Conflicts:
	html/html_task2.html