hh
Merge branch 'gril2B' of https://github.com/gril2/codereviewtest

Conflicts:
	testtxt.txt