Merge pull request #1 from MetisDmitry/master

Test pull request
Conflict situation test
Merge origin/master into MetisDmitry-master

Conflicts:
	README
	about.html
New text for index page was added