little save before pull
refactor index.html
Merge branch 'master' of https://github.com/gregorytkach/htmlsite1

Conflicts:
	.idea/workspace.xml
implement video;
implement sidebar;
Merge branch 'master' of https://github.com/gregorytkach/htmlsite1

Conflicts:
	.idea/workspace.xml
	index.html