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

Conflicts:
	index.htm
 Please enter s commit
 because i thought it was really necessary
 really really
 the commit message for your changes. Lines starting