commit4
Merge branch 'master' of github.com:krivov/demo

Conflicts:
	index.html