add Olya.html
Merge branch 'testing'

Conflicts:
	hello.html
change hello.html and add page_Olya
Merge branch 'master' of https://github.com/beniaminov/git_tests