Beleirtam egy sort a testfileba a gepemrol.
Merge branch 'master' of https://github.com/balg/meetnow2

Conflicts:
	testfile.txt