major updates
Merge branch 'master' of https://github.com/pestretsov/pestretsov.github.io

Conflicts:
	test.html