made mortar specific
Merge branch 'master' of http://github.com/seev/gitTest

Conflicts:
	index.html