edycja
Merge remote branch 'origin/master' into test5
Merge remote branch 'origin/master' into test5

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

Conflicts:
	index.html