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

Conflicts:
	testtxt.txt
Merge pull request #5 from gril2/master

ㅅㅅ