zminay 2
Merge remote branch 'origin/test2'

Conflicts:
	index.html
Merge branch 'master' of github.com:gittestmentor/mentor

Conflicts:
	index.html