changed mortar
Merge branch 'master' of https://github.com/OneataBogdan/newGitTest

Conflicts:
	index.html
change