made mortar more specific
Merge branch 'master' of https://github.com/kharad/newGitTest

t
quit
t
added index.html
Merge branch 'master' of https://github.com/kharad/newGitTest

Conflicts:
	index.html