testing VCS
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/vcs.xml
	index-multipage.html
Merge remote-tracking branch 'origin/master'
testing VCS
Merge remote-tracking branch 'origin/master'

Conflicts:
	index-multipage.html
testing VCS
testing VCS
Merge remote-tracking branch 'origin/master'
testing VCS